]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfebefe 184a2db)
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Dec 2014 16:00:02 +0000 (11:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Dec 2014 16:00:02 +0000 (11:00 -0500)

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