[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit d5c1b7f1855caaa08c1a3f2620d356a4de36b343
Merge: 9665bad 5636b16
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 12 10:16:06 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug22349 |  9 +++++++++
 src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 53 insertions(+), 12 deletions(-)