commit 022d32252a34fc881d2f9ed661d659b752b83c34 Merge: 71267be 24fbb9a Author: Nick Mathewson nickm@torproject.org Date: Wed May 11 13:17:02 2016 -0400

Merge branch 'maint-0.2.8'

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(-)