commit 7892683e7e491c32d1ea3c44d47877fe9ed7c850 Merge: 8f893fb e1d7661 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 11 10:14:50 2017 -0500

Merge remote-tracking branch 'asn/bug20852_v1'

src/or/hs_cache.c | 13 +++++++++++++ src/or/hs_cache.h | 2 ++ src/or/hs_descriptor.c | 16 +++++++++------- src/or/hs_descriptor.h | 2 +- src/or/parsecommon.h | 2 +- 5 files changed, 26 insertions(+), 9 deletions(-)