[tor-commits] [tor/master] elevate the "agree on canonical" stuff to major