]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d1801b 01bb260)
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Wed, 29 Jul 2015 14:48:13 +0000 (10:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 29 Jul 2015 14:48:13 +0000 (10:48 -0400)

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