Merge branch '2.9dev' into run_allciphers_sockets

This commit is contained in:
David Cooper 2016-11-08 08:43:24 -05:00
commit facf34391f
2 changed files with 3 additions and 4 deletions

5
.gitignore vendored
View File

@ -1,7 +1,8 @@
.DS_Store
tmp.json
*.bak
*.json
*.csv
*.log
*.xml
*.iml

View File

@ -8489,8 +8489,6 @@ EOF
}
maketempf() {
local n
TEMPDIR=$(mktemp -d /tmp/ssltester.XXXXXX) || exit -6
TMPFILE=$TEMPDIR/tempfile.txt || exit -6
if [[ "$DEBUG" -eq 0 ]]; then