]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/fancy_test_tricks'
authorNick Mathewson <nickm@torproject.org>
Mon, 15 Jul 2013 16:02:18 +0000 (12:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 15 Jul 2013 16:02:18 +0000 (12:02 -0400)
commitc0391bae75e9eb71f5fa2ab24fc97792c204225d
tree9701969423b86fdc2ba04080338d817c3b5c9864
parent2cb59be9993ecec13ceabc0c4754e52f8c5ea4e5
parentec6c155f827000e337796f1f1c54299fbc5cf72a
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.
configure.ac
src/common/include.am
src/common/log.c
src/common/torlog.h
src/or/config.c
src/or/config.h
src/or/main.c