]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 431c8d0 cc4c184)
Merge branch 'maint-0.3.0' into maint-0.3.1
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Jul 2017 19:37:53 +0000 (15:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Jul 2017 19:37:53 +0000 (15:37 -0400)
This is an "ours" merge to avoid taking any changs from maint-0.3.0:
we don't want to take the travis file, since there is a separate branch
for putting it in 0.3.1 and later.


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