]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b683b9a 8a060d8)
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Thu, 12 Mar 2015 16:27:54 +0000 (12:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 Mar 2015 16:27:54 +0000 (12:27 -0400)

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