[tor-commits] [tor/master] Merge branch 'ticket31705_v2' into ticket31705_v2_merged