From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 15 Jul 2013 16:02:18 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/fancy_test_tricks'
X-Git-Tag: tor-0.2.5.1-alpha~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0391bae75e9eb71f5fa2ab24fc97792c204225d;p=thirdparty%2Ftor.git

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.
---

c0391bae75e9eb71f5fa2ab24fc97792c204225d
diff --cc src/common/include.am
index e700bd5ca8,3f5a0e0d0e..032befd209
--- a/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				\