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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.1'

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