]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
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
src/test/test_pt.c

Simple merge
Simple merge