[tor-commits] [tor/master] Merge branch 'ticket28453_v2' into ticket28453_v2_merged