commit ed4213fa08a92af6fed2ddc5dda1747f2af25e50 Merge: d7ec170 04f7944 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 2 12:07:10 2016 -0500

Merge remote-tracking branch 'teor/bug20667'

changes/bug20667 | 5 +++++ changes/bug20839 | 5 +++++ doc/tor.1.txt | 12 +++++++----- src/or/control.c | 2 +- src/or/dirserv.c | 9 +++++++-- src/or/networkstatus.c | 42 ++++++++++++++++++++++++++++++++++-------- src/or/networkstatus.h | 2 ++ src/or/routerlist.c | 20 +++++++++++--------- 8 files changed, 72 insertions(+), 25 deletions(-)