]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b448ec1 d315b8e)
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Fri, 3 Oct 2014 23:58:25 +0000 (19:58 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 3 Oct 2014 23:58:25 +0000 (19:58 -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