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

commit d8114a1f572f01559b149dff53d380bdad6f29c0 Merge: 08fca9414 7e7b052b2 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 24 10:37:36 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25901 | 3 +++ src/or/hs_service.c | 4 ++++ 2 files changed, 7 insertions(+)