Merge branch 'maint-0.2.2'
commite58584ebdca7beb3758abebb49c33838b6627213
authorRoger Dingledine <arma@torproject.org>
Wed, 29 Sep 2010 21:21:43 +0000 (29 17:21 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 29 Sep 2010 21:21:43 +0000 (29 17:21 -0400)
treeaefb5849f16e4376f27ea09fa92d22339d499b37
parentea9f0bd08a4dc52ff488872c42909911b64702b2
parentda98b9bdb2c1272e6a9f60c4ad708dc09053990f
Merge branch 'maint-0.2.2'