Merge remote branch 'arma/bug2403' into maint-0.2.2
commit16b8b9b00f414343030c29990930c0e52a01fd84
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 23:38:03 +0000 (22 18:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 23:38:03 +0000 (22 18:38 -0500)
treeb5f72eb6b0f75cc53b3244ec5631ec9a2b645858
parent530e87ce316f8a3feb1b116c89cc703090217e2d
parenta2727f62494b8a56152214017ac8fb348dd064be
Merge remote branch 'arma/bug2403' into maint-0.2.2