Merge remote branch 'origin/maint-0.2.1'
commitc05c8dbd78f13bff79cda8fda1579aba51e30b0c
authorNick Mathewson <nickm@torproject.org>
Wed, 8 Sep 2010 14:59:45 +0000 (8 10:59 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 8 Sep 2010 14:59:45 +0000 (8 10:59 -0400)
treee2bcec28ff89c77e495c07bca9204a5afd93549b
parentfca222f0ce6e7fb354c3a6e0b3950d1985b59f82
parentf3f982005811a8b0e994ad3082f585c3ac5b660f
Merge remote branch 'origin/maint-0.2.1'