]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de397d5 3d0c090)
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Sun, 12 Jul 2015 17:34:22 +0000 (13:34 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 12 Jul 2015 17:34:22 +0000 (13:34 -0400)
This is an "ours" merge to avoid bumping the version number in master.


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