]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3ec811 6d375f1)
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 14:21:15 +0000 (10:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 14:21:15 +0000 (10:21 -0400)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/common/crypto_s2k.c patch | diff1 | diff2 | blob | history

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