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