Merge branch 'maint-0.2.2' into release-0.2.2tor-0.2.2.20-alpha
commitaae58deb2cdcaad0ccfbccf26be83a79aad41efa
authorRoger Dingledine <arma@torproject.org>
Fri, 17 Dec 2010 00:24:19 +0000 (16 19:24 -0500)
committerRoger Dingledine <arma@torproject.org>
Fri, 17 Dec 2010 00:24:19 +0000 (16 19:24 -0500)
tree15923379975023b1a85b7d162af04a8d691999cf
parent625606ed6a88b4460e293481b18b84b2501ccd13
parenta62038f01db0df22f864623e6d82d69b447c1414
Merge branch 'maint-0.2.2' into release-0.2.2