[tor-commits] [tor/master] Whoops -- this got lost in the merge.