]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5acf6f8 c06b7f0)
Merge branch 'maint-0.3.3' into maint-0.3.4
authorNick Mathewson <nickm@torproject.org>
Fri, 9 Nov 2018 15:49:47 +0000 (10:49 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 9 Nov 2018 15:49:47 +0000 (10:49 -0500)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/common/tortls.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/common/tortls.c
Simple merge
Mirror of https://git.torproject.org/tor.git