commit c7a1a987d6dfcb65a5fd639cc3d37b76809c37d5 Merge: 55a3dad70 9592797cf Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 25 12:25:41 2017 -0400

Merge branch 'maint-0.3.2'

changes/bug23790 | 6 ++++++ src/or/rendservice.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+)