[tor-commits] [tor/maint-0.2.7] Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7

commit 4e94580591da579e53461aeedfb1340836427c02 Merge: 039fc84 bf3e32a Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 11 13:13:23 2016 -0400 Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7 changes/bug19032 | 4 ++++ src/or/dirserv.c | 31 ++++++++++++++++--------------- src/or/dirserv.h | 2 +- src/or/networkstatus.c | 3 +-- 4 files changed, 22 insertions(+), 18 deletions(-)