Merge remote branch 'sebastian/bug2250' into maint-0.2.2
commit00446973f25227c0f805b7430e1ede6679e7ed16
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Mar 2011 21:13:28 +0000 (8 16:13 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Mar 2011 21:13:28 +0000 (8 16:13 -0500)
tree9dc00cf27b524a04e685a6e124373fa79497e88b
parentdbd4a0175600833c7f84081deaa40fd6294ce1ce
parent5c7c5e593f7d898dd5260da32c1909508ddce40b
Merge remote branch 'sebastian/bug2250' into maint-0.2.2