]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 056003d 0366ae2)
Merge branch 'maint-0.3.2' into maint-0.3.3
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 13:15:56 +0000 (09:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 13:15:56 +0000 (09:15 -0400)
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