commit f4e2c72beef2821a6f30a31ad487d9d7911df0dc Merge: f2c6c5e 7450403 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Mar 23 00:18:48 2014 -0400 Merge remote-tracking branch 'karsten/task-11070' changes/bug11070 | 4 + doc/tor.1.txt | 17 +--- src/or/config.c | 25 ++--- src/or/connection.c | 5 +- src/or/connection_or.c | 2 - src/or/directory.c | 83 +--------------- src/or/dirserv.c | 258 ------------------------------------------------ src/or/dirserv.h | 3 - src/or/or.h | 5 - src/or/router.c | 16 +-- src/or/router.h | 1 - src/or/routerlist.c | 2 - src/or/routerparse.c | 11 --- src/or/routerparse.h | 1 - 14 files changed, 25 insertions(+), 408 deletions(-)