Merge remote-tracking branch 'public/fancy_test_tricks'

Conflicts:
	src/common/include.am

Conflict was from adding testsupport.h near where sandbox.h had
already been added.

diff --cc configure.ac
Simple merge

diff --cc src/common/include.am
index e700bd5ca800ad3080978bb44fd5f3c46bd1b59d,3f5a0e0d0ee9b000fc791b6a0bf261a3190d7cb6..032befd209aa12f437f058cbd24e85fe14510940
--- 1/src/common/include.am
--- 2/src/common/include.am
+++ b/src/common/include.am
@@@ -49,10 -59,9 +59,10 @@@ LIBOR_A_SOURCES = 
    src/common/procmon.c                                        \
    src/common/util.c                                   \
    src/common/util_codedigest.c                                \
 +  src/common/sandbox.c                                        \
    $(libor_extra_source)
  
- src_common_libor_crypto_a_SOURCES = \
+ LIBOR_CRYPTO_A_SOURCES = \
    src/common/aes.c            \
    src/common/crypto.c         \
    src/common/crypto_format.c  \
@@@ -75,7 -100,7 +101,8 @@@ COMMONHEADERS = 
    src/common/memarea.h                                \
    src/common/mempool.h                                \
    src/common/procmon.h                                \
 +  src/common/sandbox.h                                \
+   src/common/testsupport.h                    \
    src/common/torgzip.h                                \
    src/common/torint.h                         \
    src/common/torlog.h                         \

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

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

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

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

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