]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76ed869 1fce9d1)
Merge branch 'maint-0.3.4' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Sun, 11 Nov 2018 23:05:45 +0000 (18:05 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 11 Nov 2018 23:05:45 +0000 (18:05 -0500)
1  2 
src/lib/tls/tortls_openssl.c patch | diff1 | diff2 | blob | history

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