This branch factors out some of the Android network code from the Tor and LAN plugins into a new NetworkManager. This removes most of the Android-specific code from the Tor plugin.
Part of #832 (closed). May also help with #1301 (closed).
This will create a new commit in order to revert the existing changes.