commit 1ea3127188f7c35ee6fab1db65afa3c84033045b
Merge: 93019b478 bf413829c
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Jan 3 09:01:40 2019 -0500
Merge branch 'ticket28973_033_squashed' into maint-0.3.3
changes/ticket28973 | 6 ++++++
src/common/tortls.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
src/or/connection_or.c | 17 ++++++++++-------
3 files changed, 61 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
