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

[nickm at torproject.org]

commit 5636b160d42e344f936f881992c19b3c27f60a2c
Merge: e111cfc f367453
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 12 10:15:49 2017 -0400

    Merge branch 'bug22349_029' into maint-0.3.1

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