Fix TypeError in _updateCountry

Addresses passed to _updateCountry can contain countries if cache.my_address is used to initialize address in BaseTunnelManager init function, which causes resolve to be called with too many arguments. /cc @jm