]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6feb149 88d81ea)
Merge 0.2.1 onto the development branch.
authorNick Mathewson <nickm@torproject.org>
Tue, 12 May 2009 17:57:58 +0000 (13:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 May 2009 17:57:58 +0000 (13:57 -0400)
Manually resolved conflicts on version number; all else applied cleanly.

1  2 
ChangeLog patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
Mirror of https://git.torproject.org/tor.git