[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug26627_033_merged_master'

[nickm at torproject.org]

commit 3a6bd21440fb435bbfc2ff809e06ebe364252628
Merge: 49d8a2109 fc4d08e26
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 30 09:01:55 2018 -0400

    Merge remote-tracking branch 'teor/bug26627_033_merged_master'

 changes/bug26627              |  7 +++++++
 src/feature/hs/hs_circuit.c   | 20 ++++++++++++++------
 src/feature/hs/hs_service.c   | 29 ++++++++++++++++++++---------
 src/feature/hs/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(-)