]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Wed, 22 Aug 2018 00:03:19 +0000 (20:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 22 Aug 2018 00:03:19 +0000 (20:03 -0400)

Trivial merge