[tor-commits] [tor/master] Merge branch 'nss_27451'
nickm at torproject.org
nickm at torproject.org
Fri Sep 14 14:22:43 UTC 2018
commit e43ae24e7d8cc96eaed41b8e135232248ac39721
Merge: dbb0abc9f 9f5f67bda
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Sep 14 10:22:38 2018 -0400
Merge branch 'nss_27451'
src/core/mainloop/connection.c | 15 +++++++++++++--
src/lib/tls/tortls.h | 1 +
src/lib/tls/tortls_nss.c | 37 +++++++++++++++++++++++++++++++++++++
src/lib/tls/tortls_openssl.c | 24 +++++++++++++++++++++++-
4 files changed, 74 insertions(+), 3 deletions(-)
More information about the tor-commits
mailing list