[tor-commits] [tor/release-0.2.3] Merge branch 'bug7014_023_squashed' into maint-0.2.3