]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc5a881 a82b18f)
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Nov 2013 15:50:05 +0000 (10:50 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Nov 2013 15:50:05 +0000 (10:50 -0500)

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