]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9029444 968b6c3)
Merge branch 'maint-0.3.5' into maint-0.4.3
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:10:08 +0000 (08:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:10:08 +0000 (08:10 -0400)
1  2 
src/lib/tls/tortls_nss.c patch | diff1 | diff2 | blob | history

diff --cc src/lib/tls/tortls_nss.c
Simple merge
Mirror of https://git.torproject.org/tor.git