]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01bb260 8b3e0b7)
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Thu, 24 Sep 2015 14:06:00 +0000 (10:06 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 24 Sep 2015 14:06:00 +0000 (10:06 -0400)

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