]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 26 Mar 2012 17:57:51 +0000 (13:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 26 Mar 2012 17:57:51 +0000 (13:57 -0400)
commit2f3ec43e5b4ee3aed0c69ee5b1d11b170f8eb88a
tree302b81d0fd1d43249011d508cc9d7ab3621a9ec2
parente103509f7aa85a1dd1bac30fccf90bb8dafcede4
parentec1bc8a979f744d70eabbf9ef37b3f9504c09cfe
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
changes/bug5090

bug5090 was already merged and corrected in the master branch's changelog.