[tor-commits] [tor/master] extend ticket33316 changes file to include more changes