]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1727/head'
authorNick Mathewson <nickm@torproject.org>
Fri, 14 Feb 2020 13:20:21 +0000 (08:20 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 14 Feb 2020 13:20:21 +0000 (08:20 -0500)
1  2 
src/core/or/protover.c

Simple merge