Merge branch 'careful_with_all_descs' into maint-0.2.1
commit0f637492e30e19ad7abeedafdd58c087f01b4527
authorNick Mathewson <nickm@torproject.org>
Sun, 6 Mar 2011 18:35:42 +0000 (6 13:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 6 Mar 2011 18:35:42 +0000 (6 13:35 -0500)
tree4a018ee715bd047d5a44adeb9a8481148b5a0ad0
parent8b01fd7badc893b849d4394a2b72d422eecf7913
parentb231026c42ea5cd884b4bde25cde3ba2c6e5ca98
Merge branch 'careful_with_all_descs' into maint-0.2.1