]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1862/head'
authorNick Mathewson <nickm@torproject.org>
Fri, 24 Apr 2020 12:14:59 +0000 (08:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 24 Apr 2020 12:14:59 +0000 (08:14 -0400)
1  2 
src/core/or/connection_or.c

Simple merge