BUG 10538: Routes may only added once and should not be part of an internal network
ovpnmain.cgi: Sortorder clientstatus and control - Type, Name
tor: Update to 0.2.4.22.
Merge remote-tracking branch 'amarx/10538' into next
core80: Add changed CGI files.
Merge remote-tracking branch 'stevee/tor-update' into next