Merge branch 'maint-0.4.0'

diff --cc src/test/test_key_expiration.sh
index 1ed81c81c7e2dcd594abd762f44b16b01750c32b,3474210607c0200f7071de890838746ca82c6df9..54abb4a2fa1dce3a16efc1b022f038d8213fa440
--- 1/src/test/test_key_expiration.sh
--- 2/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@@ -60,12 -60,13 +60,13 @@@ if [ ! -d "$DATA_DIR" ]; the
    echo "Failure: mktemp invocation result doesn't point to directory" >&2
    exit 3
  fi
 -trap "rm -rf '$DATA_DIR'" 0
 +trap 'rm -rf "$DATA_DIR"' 0
  
  # Use an absolute path for this or Tor will complain
 -DATA_DIR=`cd "${DATA_DIR}" && pwd`
 +DATA_DIR=$(cd "${DATA_DIR}" && pwd)
  
  touch "${DATA_DIR}/empty_torrc"
+ touch "${DATA_DIR}/empty_defaults_torrc"
  
  QUIETLY="--hush"
  SILENTLY="--quiet"

diff --cc src/test/test_keygen.sh
index 9fbf7dd578a7931af59dd43b4aa750c8c78b2354,7afff271cbd26462fcc1298cf729db0148499d28..cbdfd1909cad26b152e2f0b7d0a161e989481595
--- 1/src/test/test_keygen.sh
--- 2/src/test/test_keygen.sh
+++ b/src/test/test_keygen.sh
@@@ -77,12 -77,13 +77,13 @@@ if [ ! -d "$DATA_DIR" ]; the
    echo "Failure: mktemp invocation result doesn't point to directory" >&2
    exit 3
  fi
 -trap "rm -rf '$DATA_DIR'" 0
 +trap 'rm -rf "$DATA_DIR"' 0
  
  # Use an absolute path for this or Tor will complain
 -DATA_DIR=`cd "${DATA_DIR}" && pwd`
 +DATA_DIR=$(cd "${DATA_DIR}" && pwd)
  
  touch "${DATA_DIR}/empty_torrc"
+ touch "${DATA_DIR}/empty_defaults_torrc"
  
  QUIETLY="--hush"
  SILENTLY="--quiet"

diff --cc src/test/zero_length_keys.sh
index 4069148e0bcb3596020ff98e3d39f3b8ac117dea,5635bdfd891b1fedac90005913c19405cac6c820..1702d11245f2f7ffbd7cc809a188617754bf9efa
--- 1/src/test/zero_length_keys.sh
--- 2/src/test/zero_length_keys.sh
+++ b/src/test/zero_length_keys.sh
@@@ -40,9 -40,10 +40,10 @@@ if [ ! -d "$DATA_DIR" ]; the
    echo "Failure: mktemp invocation result doesn't point to directory" >&2
    exit 3
  fi
 -trap "rm -rf '$DATA_DIR'" 0
 +trap 'rm -rf "$DATA_DIR"' 0
  
  touch "$DATA_DIR"/empty_torrc
+ touch "$DATA_DIR"/empty_defaults_torrc
  
  # DisableNetwork means that the ORPort won't actually be opened.
  # 'ExitRelay 0' suppresses a warning.