commit 6a08bcf530f5991ae0e2600ef01be377857b5942 Merge: 2ba6542 2f8cf52 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 16 15:47:00 2015 -0400

Merge remote-tracking branch 'public/ticket16543'

changes/bug16543 | 5 +++++ src/or/config.c | 4 ++-- src/or/directory.c | 6 ++---- src/or/dirserv.c | 18 ++++++------------ src/or/dirvote.h | 3 +-- src/or/networkstatus.c | 2 +- src/or/or.h | 3 --- src/or/router.c | 2 +- src/or/routerlist.c | 5 ----- 9 files changed, 18 insertions(+), 30 deletions(-)