Uplift patches to maint-0.2.9

It would be helpful to have these in the stable releases,

https://gitweb.torproject.org/tor-launcher.git/commit/?id=985b87cb1c6e6e0d70adb9279232423bd105eb4f https://gitweb.torproject.org/tor-launcher.git/commit/?id=44c1cc246e8736e88906c74058f2c582aa6178ed