]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3368b0c 746bb55)
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Thu, 15 Jan 2015 17:38:43 +0000 (12:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 15 Jan 2015 17:38:43 +0000 (12:38 -0500)

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