[tor-commits] [tor/master] Merge branch 'bug23466_squashed'

[nickm at torproject.org]

commit 00bf4ed592edfe73505499ce525aa3c96d35ae34
Merge: dcaf971a0 6b794c7ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 13 14:54:56 2017 -0400

    Merge branch 'bug23466_squashed'

 src/or/hs_cache.c          | 63 ++++++++++++++++++++++++++++++++++++++--------
 src/or/hs_cache.h          |  6 +++--
 src/or/hs_common.c         | 14 +++++++----
 src/test/hs_test_helpers.c |  2 +-
 src/test/test_hs_cache.c   | 57 +++++++++++++++++++++++++++++++++++++----
 5 files changed, 118 insertions(+), 24 deletions(-)