]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 062497f 9d1801b)
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Sun, 12 Jul 2015 20:37:59 +0000 (16:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 12 Jul 2015 20:37:59 +0000 (16:37 -0400)
This is an 'ours' merge, to avoid taking the bump to 0.2.6.10-dev


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