[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit 936e2aa0de6edb0578e18ad0760a67ad64a448d4
Merge: 4847e2216 c798957b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 16 08:37:11 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26932    | 3 +++
 src/or/hs_service.c | 1 +
 2 files changed, 4 insertions(+)