]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:10:08 +0000 (12:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:10:08 +0000 (12:10 -0400)
1  2 
.appveyor.yml

diff --cc .appveyor.yml
Simple merge