[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug21334_v3'
nickm at torproject.org
nickm at torproject.org
Mon Mar 13 20:21:27 UTC 2017
commit 43dd9bf0fc341c9e6f2df1700ec8f5b64960c3f2
Merge: 118d701 61f318b
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Mar 13 16:18:55 2017 -0400
Merge remote-tracking branch 'asn/bug21334_v3'
src/or/hs_descriptor.c | 918 ++++++++++++++++++++++++++++++------------
src/or/hs_descriptor.h | 34 +-
src/or/parsecommon.h | 6 +-
src/test/test_hs_cache.c | 6 +-
src/test/test_hs_descriptor.c | 146 +++++--
5 files changed, 812 insertions(+), 298 deletions(-)
More information about the tor-commits
mailing list