]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1530d0 b928095)
Merge branch 'maint-0.2.9'
authorNick Mathewson <nickm@torproject.org>
Wed, 1 Feb 2017 15:39:59 +0000 (10:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 Feb 2017 15:39:59 +0000 (10:39 -0500)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/test/test_tortls.c patch | diff1 | diff2 | blob | history

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