]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Oct 2019 16:27:39 +0000 (12:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Oct 2019 16:27:39 +0000 (12:27 -0400)
1  2 
src/feature/client/transports.c

Simple merge