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

[nickm at torproject.org]

commit 1533e0c3503e277bafaaf9a7331fd653809e74c9
Merge: d78f25c07 b49355915
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 16 08:37:11 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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