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

[nickm at torproject.org]

commit 46c2b0ca228d2d95666f28d4e42411dce0a59e15
Merge: 841ed9dbb 969a38a37
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 27 07:04:33 2018 -0400

    Merge branch 'bug25213_033' into maint-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(-)