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

[nickm at torproject.org]

commit a79a86c6d806ecf3f40a618bdfdf832b04d81c81
Merge: 91d999e17 c798957b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 16 08:37:11 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

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