]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9652c65 3bf9174)
Merge remote-tracking branch 'tlyu-github/travis-workaround-master'
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 15:18:55 +0000 (10:18 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 15:18:55 +0000 (10:18 -0500)

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