]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Sep 2018 12:17:42 +0000 (08:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Sep 2018 12:17:42 +0000 (08:17 -0400)
1  2 
.appveyor.yml

diff --cc .appveyor.yml
Simple merge