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