]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ed5733 26c344a)
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Apr 2015 18:46:53 +0000 (14:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Apr 2015 18:46:53 +0000 (14:46 -0400)

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