[tor-commits] [tor/master] Merge branch 'careful_with_all_descs' into maint-0.2.1