commit 6c83fe996ba280ebd9d8b57e1830428011cd96a1
Merge: 5c4ec3f33 0bc5b7ae9
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Aug 8 11:24:08 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31343 | 9 +++++++++
src/core/or/channeltls.c | 20 ++++++++++++++++----
src/feature/nodelist/routerlist.c | 6 ++++--
3 files changed, 29 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
