commit 58f4aee90b753aaa4bca51fd5ffe488fddbef577 Merge: 13a2acba3 17daab76b Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 23 14:06:27 2018 -0500

Merge remote-tracking branch 'asn/bug24896'

changes/bug24896 | 3 +++ src/or/circuituse.c | 6 ++++++ src/or/hs_service.c | 3 +++ src/or/hs_stats.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/hs_stats.h | 14 +++++++++++++ src/or/include.am | 2 ++ src/or/status.c | 25 +++++++++++++++++++++++ 7 files changed, 111 insertions(+)