]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Oct 2018 18:27:24 +0000 (14:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Oct 2018 18:27:24 +0000 (14:27 -0400)

Trivial merge