Merge branch 'bug2181' into maint-0.2.2
commite6da9a98e9697d8d9ad9ef4ea224b09be1f6ce13
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Jan 2011 16:46:13 +0000 (26 11:46 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Jan 2011 16:46:13 +0000 (26 11:46 -0500)
tree31b8c5d27791b82f3df03d392bf0a11a1ccec0bb
parent58dfebbcb41b4b13b7aad3cccf85c85e4c6bc2c6
parent1dd98891d74cbd7e4e64b0943254dc4a78fb658e
Merge branch 'bug2181' into maint-0.2.2