[tor-commits] [tor/release-0.2.4] Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4