]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4dc8dc4 55d6fd2)
Merge remote-tracking branch 'sebastian/bug18242'
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Feb 2016 20:38:52 +0000 (15:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Feb 2016 20:38:52 +0000 (15:38 -0500)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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