Merge remote branch 'public/bug2378' into maint-0.2.2
commit2fa9ddb9580fc0d69967c54f16825f14658fd9b9
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Feb 2011 18:54:28 +0000 (3 13:54 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Feb 2011 18:54:28 +0000 (3 13:54 -0500)
tree6022eea472e9dabd0bcbf2ed07d77aa114471e75
parente6da9a98e9697d8d9ad9ef4ea224b09be1f6ce13
parente80bdfb4a02c6f8313baec6e9b00ec3baac3da87
Merge remote branch 'public/bug2378' into maint-0.2.2