[tor-commits] [tor/maint-0.3.4] Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3

[nickm at torproject.org]

commit 4f854dbdc2f3ade1b6c0cb610907fe1ad085f9ca
Merge: a159eaf45 3821081a5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 30 09:01:45 2018 -0400

    Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3

 changes/bug26627              |  7 +++++++
 src/or/hs_circuit.c           | 20 ++++++++++++++------
 src/or/hs_service.c           | 29 ++++++++++++++++++++---------
 src/or/hs_service.h           |  5 +++--
 src/test/test_hs_cell.c       |  4 ++--
 src/test/test_hs_intropoint.c |  4 ++--
 src/test/test_hs_service.c    |  2 +-
 7 files changed, 49 insertions(+), 22 deletions(-)