]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc1ea4f 1deda21)
Merge branch 'maint-0.2.5' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 21:56:31 +0000 (16:56 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 21:56:31 +0000 (16:56 -0500)
1  2 
src/or/connection.c patch | diff1 | diff2 | blob | history

diff --cc src/or/connection.c
Simple merge
Mirror of https://git.torproject.org/tor.git