Merge branch 'maint-0.2.2'
commitcb3c3c63cb5d0ee1a927dd9cc2fc67d3cc7bc88f
authorRoger Dingledine <arma@torproject.org>
Tue, 8 Mar 2011 21:14:53 +0000 (8 16:14 -0500)
committerRoger Dingledine <arma@torproject.org>
Tue, 8 Mar 2011 21:14:53 +0000 (8 16:14 -0500)
tree75fad8c8fd5acb3a2eed7d964eb48f8d936ed315
parentf9bb3ced51422bc8f6c3702a169a799614bbce02
parentdbd4a0175600833c7f84081deaa40fd6294ce1ce
Merge branch 'maint-0.2.2'