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

[nickm at torproject.org]

commit b49355915bf063448cf338fbb76061b601e5e333
Merge: 2deee972a 936e2aa0d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 16 08:37:11 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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