commit 4de20d175476ab684ca15ea794af729348297540
Merge: 84bc75b2e 86583ad78
Author: Nick Mathewson <ni...@torproject.org>
Date: Sat Feb 10 16:09:01 2018 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug24978 | 7 +++++++
src/common/ciphers.inc | 21 ++++++++++++++++++++-
src/common/tortls.c | 28 +++++++++++++++++++++++++---
3 files changed, 52 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
