]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16430fd 59a88b3)
Merge remote-tracking branch 'tor-github/pr/645'
authorNick Mathewson <nickm@torproject.org>
Thu, 17 Jan 2019 17:04:50 +0000 (12:04 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 17 Jan 2019 17:04:50 +0000 (12:04 -0500)
1  2 
src/feature/client/transports.c patch | diff1 | diff2 | blob | history
src/test/test_pt.c patch | diff1 | diff2 | blob | history

diff --cc src/feature/client/transports.c
Simple merge
diff --cc src/test/test_pt.c
Simple merge
Mirror of https://git.torproject.org/tor.git