[tor-commits] [torspec/master] Merge proposal 204 into addr-spec.txt