Merge branch 'maint-0.3.5' into maint-0.4.3
commit9587512578e1c45d62e5e97dd9222fe891c835cd
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:10:08 +0000 (7 08:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:10:08 +0000 (7 08:10 -0400)
treefb30628a8327efba5a29fcd7071a10d51f8056f6
parent902944448206d359d3f799ecf8a504bdff493272
parent968b6c30c1158fde003a99a7d22a575e3b211c91
Merge branch 'maint-0.3.5' into maint-0.4.3
src/lib/tls/tortls_nss.c