commit 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 Merge: dd17df2 2729f16 Author: Nick Mathewson nickm@torproject.org Date: Thu May 19 15:56:31 2016 -0400

Merge remote-tracking branch 'public/bug19073' into maint-0.2.8

src/or/dirserv.c | 17 +++++++------- src/or/dirvote.c | 7 +++--- src/or/or.h | 6 ----- src/or/router.c | 57 ++++++++++++++++++++++++----------------------- src/or/routerlist.c | 5 ++--- src/or/routerparse.c | 15 +++++++------ src/test/test_dir.c | 9 ++++---- src/test/test_microdesc.c | 2 +- 8 files changed, 58 insertions(+), 60 deletions(-)