[tor-commits] [torbutton/master] Add plumbing that might've helped #1968, except it didn't.