commit 68181dc2634edbc381231abb23329961586d958f
Merge: a99ca9313 652d22e60
Author: Nick Mathewson <[email protected]>
Date: Tue Oct 31 12:19:42 2017 -0400
Merge branch 'maint-0.3.2' into release-0.3.2
changes/bug23762 | 4 +
src/or/connection_edge.c | 9 +-
src/or/hs_client.c | 181 ++++++++++++++++++++++++++++++-----------
src/or/hs_client.h | 1 +
src/or/nodelist.c | 2 +
src/test/test_channelpadding.c | 12 ++-
src/test/test_entryconn.c | 5 +-
7 files changed, 157 insertions(+), 57 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
