Commit 3bc45368 authored by Joanne Hugé's avatar Joanne Hugé

Make country tunnel parameter naming consistent

parent 04a736f1
......@@ -687,10 +687,10 @@ class TunnelManager(BaseTunnelManager):
'client_count', 'max_clients', 'same_country', 'tunnel_refresh'))
def __init__(self, control_socket, cache, cert, openvpn_args,
timeout, client_count, iface_list, country, address, ip_changed,
timeout, client_count, iface_list, conf_country, address, ip_changed,
remote_gateway, disable_proto, neighbour_list=()):
super(TunnelManager, self).__init__(control_socket,
cache, cert, country, address)
cache, cert, conf_country, address)
self.ovpn_args = openvpn_args
self.timeout = timeout
self._read_sock, self.write_sock = socket.socketpair(
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment