commit 1f3db0514e07b1022dd4d523ff97997139e1b187
Merge: 45530ed72 648d5ea67
Author: Nick Mathewson <[email protected]>
Date: Tue Sep 26 08:55:59 2017 -0400
Merge remote-tracking branch 'asn/ticket23645_032_01'
src/or/circuitlist.c | 8 ++++--
src/or/circuituse.c | 64 ++++++++++++++++++++++++++++------------------
src/or/hs_service.c | 9 ++++---
src/test/test_hs_service.c | 6 ++---
4 files changed, 54 insertions(+), 33 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
