commit d5580d9a2778ac399aa6db44ad602cf02e7c1dbe Merge: 1f3e0f157 46c2b0ca2 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 27 07:05:15 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

changes/bug25213 | 5 +++++ src/or/circuitbuild.c | 14 ++++++++++++-- src/test/test_hs_service.c | 4 ++++ 3 files changed, 21 insertions(+), 2 deletions(-)