Batch modification to #6473, #16520 by irl: -- Tickets URL: <https://trac.torproject.org/projects/tor/query?id=6473%2C16520> Tor Bug Tracker & Wiki <https://trac.torproject.org/> The Tor Project: anonymity online