[tor-dev] Proposals 220 and 228 updated