Merge commit 'sebastian/bug2317' into maint-0.2.2
commit7699014e1e9e183d1fd840e59909bcf77ba3321b
authorRoger Dingledine <arma@torproject.org>
Sun, 16 Jan 2011 02:54:49 +0000 (15 21:54 -0500)
committerRoger Dingledine <arma@torproject.org>
Sun, 16 Jan 2011 02:54:49 +0000 (15 21:54 -0500)
tree2cfae869dd2470c7b51a15f15b4d1a240658d9f9
parentbebd95e2c99ab3d17ebf6d1b005f483af079330a
parenta1860cc3f1d6224f3be40319a075471cb491e1aa
Merge commit 'sebastian/bug2317' into maint-0.2.2