]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: add0004 0c81bdc)
Merge branch 'appveyor_min_029_v2' into appveyor_min_034_v2
authorNick Mathewson <nickm@torproject.org>
Tue, 22 May 2018 13:57:12 +0000 (09:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 May 2018 13:57:12 +0000 (09:57 -0400)

Trivial merge
Mirror of https://git.torproject.org/tor.git