]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b01fd7 b231026)
Merge branch 'careful_with_all_descs' into maint-0.2.1
authorNick Mathewson <nickm@torproject.org>
Sun, 6 Mar 2011 18:35:42 +0000 (13:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 6 Mar 2011 18:35:42 +0000 (13:35 -0500)

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