[tor-commits] [tor/master] Changes for #17158, #17905, #18689, #18749 & April 2016 fallbacks