[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit 979c7e5c83531089aa4bf3998ae3353fbdd2031d
Merge: 0eed0899c 46c2b0ca2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 27 07:05:15 2018 -0400

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