]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'appveyor_min_034_v2'
authorNick Mathewson <nickm@torproject.org>
Wed, 23 May 2018 19:08:50 +0000 (15:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 23 May 2018 19:08:50 +0000 (15:08 -0400)

Trivial merge