[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 3aba8490ba590899b6c23071ef0b4269d8c36d37
Merge: 4984d62 5636b16
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 12 10:16:06 2017 -0400

    Merge branch 'maint-0.3.1'

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