]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4438b2a a13d0fd)
Merge branch 'libscrypt_eq_openssl_squashed'
authorNick Mathewson <nickm@torproject.org>
Thu, 9 Jul 2015 20:31:42 +0000 (16:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 9 Jul 2015 20:31:42 +0000 (16:31 -0400)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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