Merge remote branch 'sebastian/bug2450' into maint-0.2.2
commite94ee583d6f81f2375ea9126e77495aeb3ca18bf
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Feb 2011 18:59:58 +0000 (3 13:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Feb 2011 18:59:58 +0000 (3 13:59 -0500)
treef444303fa981304b8f0d6cd9fe85bc704897c9ca
parent2fa9ddb9580fc0d69967c54f16825f14658fd9b9
parentf2bb7b17d7453a14d2be931f3e21c51f623443e4
Merge remote branch 'sebastian/bug2450' into maint-0.2.2