Merge branch '978-tor-only-on-battery' into 'master'

Add a setting to disable Tor when running on battery

Closes #978

See merge request !1032
1 job for master in 8 minutes and 44 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #2981
test

00:08:44