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

[nickm at torproject.org]

commit 7ed803749595d9d22a1cf021430b8ec6a3432943
Merge: ff2c31093 6307a759e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 29 11:11:12 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug22159     |  7 +++++++
 src/or/rendservice.c | 34 +++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 11 deletions(-)