[tor-commits] [tor/master] Merge branch 'link_ftrapv_clang32'