Merge branch 'maint-0.2.2'
commit9bfb8af265ce6423107e7991228b84af96b7af7b
authorRoger Dingledine <arma@torproject.org>
Thu, 5 Jan 2012 11:55:34 +0000 (5 06:55 -0500)
committerRoger Dingledine <arma@torproject.org>
Thu, 5 Jan 2012 11:55:34 +0000 (5 06:55 -0500)
tree251c7a7a2196a1077d42109507dd5368e5f615f4
parentff03347579b3b43bf4ee3803b1e63a88a9835fe7
parenta1074c7aa2afab595d434c52754ee47cec404189
Merge branch 'maint-0.2.2'