Merge branch 'maint-0.2.3' into release-0.2.3
commit55cae7dbf17352b0556a4099bebca8acb88b329d
authorRoger Dingledine <arma@torproject.org>
Fri, 19 Oct 2012 18:30:58 +0000 (19 14:30 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 19 Oct 2012 18:30:58 +0000 (19 14:30 -0400)
tree589e330695f079a46df961f7ccbbab35204b1985
parent60d0964c9a015a8a90f88f1fcd07534937a867a4
parent1cc06bd35e4203569ecc72ff314a1dd543f60651
Merge branch 'maint-0.2.3' into release-0.2.3