]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34edf17 8024f6a)
Merge remote-tracking branch 'public/bug15760_hard_026_v2'
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Jun 2015 19:08:14 +0000 (15:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Jun 2015 19:08:14 +0000 (15:08 -0400)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/common/tortls.c patch | diff1 | diff2 | blob | history

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