]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1bdb6e 5ad47aa)
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Wed, 4 Mar 2015 11:15:10 +0000 (12:15 +0100)
committerNick Mathewson <nickm@torproject.org>
Wed, 4 Mar 2015 11:15:10 +0000 (12:15 +0100)

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