commit 0cf327dc7874ae0a021054b78cbb7b24a11aa8fe Merge: e4d2177 a4e9d67 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Mar 15 12:17:23 2013 -0400 Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4 src/common/address.c | 113 ------------------------------------------------ src/common/address.h | 4 -- src/common/container.h | 5 -- src/common/crypto.c | 21 +-------- src/common/crypto.h | 1 - src/common/util.c | 109 ---------------------------------------------- src/common/util.h | 6 --- src/or/dirserv.h | 1 - src/or/hibernate.c | 4 -- src/or/main.c | 4 -- src/or/networkstatus.c | 12 ----- src/or/networkstatus.h | 1 - src/or/or.h | 9 ---- src/or/rendcommon.c | 7 --- src/or/rendcommon.h | 1 - src/or/router.c | 17 ------- src/or/router.h | 2 - src/or/routerlist.c | 50 --------------------- src/or/routerlist.h | 2 - src/or/transports.c | 4 -- src/test/test.c | 5 -- src/test/test_crypto.c | 16 ------- src/test/test_dir.c | 2 - src/test/test_util.c | 73 ------------------------------- 24 files changed, 2 insertions(+), 467 deletions(-)