commit 025dc19b63ce043d89e9f94743d0f74dd9d4e879 Merge: f4f7e7a c35fad2 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 7 11:02:27 2012 -0500

Merge remote-tracking branch 'public/bug6887'

changes/bug6887 | 3 + src/or/dirserv.c | 23 ++--- src/or/dirserv.h | 2 - src/or/routerparse.c | 232 -------------------------------------------------- src/or/routerparse.h | 2 - src/test/test_dir.c | 18 ---- 6 files changed, 12 insertions(+), 268 deletions(-)