]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.3.4' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Jan 2019 14:02:39 +0000 (09:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Jan 2019 14:02:39 +0000 (09:02 -0500)
1  2 
src/core/or/connection_or.c
src/lib/tls/tortls_openssl.c

Simple merge
Simple merge