Merge branch 'feature8195_small_squashed'

diff --cc configure.ac
Simple merge

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/common/compat.c
Simple merge

diff --cc src/common/compat.h
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/test/include.am
index f593782709339f73d9894f52b807c0ce756a3963,3fed3b7344ab3d1c5bf68e60c81ba47c9151d113..d52867b94eb58ef71b44a0a15413ca40d810c108
--- 1/src/test/include.am
--- 2/src/test/include.am
+++ b/src/test/include.am
@@@ -1,14 -1,11 +1,15 @@@
 -
 -export PYTHON=@PYTHON@
 -export SHELL=@SHELL@
 -export abs_top_srcdir=@abs_top_srcdir@
 -export builddir=@builddir@
 +# When the day comes that Tor requires Automake >= 1.12 change
 +# TESTS_ENVIRONMENT to AM_TESTS_ENVIRONMENT because the former is reserved for
 +# users while the later is reserved for developers.
 +TESTS_ENVIRONMENT = \
 +      export PYTHON="$(PYTHON)"; \
 +      export SHELL="$(SHELL)"; \
 +      export abs_top_srcdir="$(abs_top_srcdir)"; \
 +      export builddir="$(builddir)"; \
 +      export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)";
  
- TESTSCRIPTS = src/test/test_zero_length_keys.sh
+ TESTSCRIPTS = src/test/test_zero_length_keys.sh \
+       src/test/test_switch_id.sh
  
  if USEPYTHON
  TESTSCRIPTS += src/test/test_ntor.sh src/test/test_bt.sh