[tor-commits] [tor/master] resolve an XXX by agreeing with nickm