]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff4ba9f 0cb028b)
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Fri, 15 Aug 2014 14:07:04 +0000 (10:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 Aug 2014 14:07:04 +0000 (10:07 -0400)

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