diff --git a/src/communicatorutils/connectnewpeers.py b/src/communicatorutils/connectnewpeers.py index ccfa222d..c9a60ba0 100755 --- a/src/communicatorutils/connectnewpeers.py +++ b/src/communicatorutils/connectnewpeers.py @@ -48,7 +48,7 @@ def connect_new_peer_to_communicator(comm_inst, peer='', useBootstrap=False): tryingNew.append(x) for i in tryingNew: comm_inst.newPeers.remove(i) - + if len(peerList) == 0 or useBootstrap: # Avoid duplicating bootstrap addresses in peerList if config.get('general.use_bootstrap_list', True): @@ -57,8 +57,6 @@ def connect_new_peer_to_communicator(comm_inst, peer='', useBootstrap=False): for address in peerList: address = address.strip() - if not config.get('tor.v3onions') and len(address) == 62: - continue # Don't connect to our own address if address in transports: continue diff --git a/src/netcontroller/torcontrol/gentorrc.py b/src/netcontroller/torcontrol/gentorrc.py index 37079221..cb79c991 100644 --- a/src/netcontroller/torcontrol/gentorrc.py +++ b/src/netcontroller/torcontrol/gentorrc.py @@ -17,13 +17,11 @@ def generate_torrc(net_controller, api_server_ip): Generate a torrc file for our tor instance """ socks_port = net_controller.socksPort - hs_ver = '# v2 onions' hs_port = net_controller.hsPort home_dir = identifyhome.identify_home() tor_config_location = home_dir + '/torrc' - if config.get('tor.v3onions'): - hs_ver = 'HiddenServiceVersion 3' + hs_ver = 'HiddenServiceVersion 3' """ Set the Tor control password. diff --git a/src/utils/networkmerger.py b/src/utils/networkmerger.py index e525ba78..8e7293a9 100755 --- a/src/utils/networkmerger.py +++ b/src/utils/networkmerger.py @@ -32,8 +32,6 @@ def mergeAdders(newAdderList): for adder in newAdderList.split(','): adder = adder.strip() if not adder in keydb.listkeys.list_adders(randomOrder = False) and not adder in gettransports.get() and not blacklist.inBlacklist(adder): - if not config.get('tor.v3onions', True) and len(adder) == 62: - continue if keydb.addkeys.add_address(adder): # Check if we have the maximum amount of allowed stored peers if config.get('peers.max_stored_peers') > len(keydb.listkeys.list_adders()):