]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b3822d 883dc33)
Merge remote-tracking branch 'public/bug12693_025'
authorNick Mathewson <nickm@torproject.org>
Mon, 22 Sep 2014 18:45:38 +0000 (14:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 22 Sep 2014 18:45:38 +0000 (14:45 -0400)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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