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