From f54c4e6e259fb2d66ce90bb1a136ee541145e94f Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Mon, 9 Apr 2018 13:57:37 +0900
Subject: [PATCH] Resolve address locally if proxy and not tor

and report it correctly in peers output

Requires aiorpcX 0.5.5
Closes #301
---
 server/peers.py | 1 +
 setup.py        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/peers.py b/server/peers.py
index c7d1a89..bcb70c2 100644
--- a/server/peers.py
+++ b/server/peers.py
@@ -544,6 +544,7 @@ class PeerManager(object):
             if not self.proxy:
                 return
             kwargs['proxy'] = self.proxy
+            kwargs['resolve'] = not peer.is_tor
         elif host:
             # Use our listening Host/IP for outgoing non-proxy
             # connections so our peers see the correct source.
diff --git a/setup.py b/setup.py
index 3d0941a..984c04c 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setuptools.setup(
     # "x11_hash" package (1.4) is required to sync DASH network.
     # "tribus_hash" package is required to sync Denarius network.
     # "blake256" package is required to sync Decred network.
-    install_requires=['aiorpcX >= 0.5.4', 'plyvel', 'pylru', 'aiohttp >= 1'],
+    install_requires=['aiorpcX >= 0.5.5', 'plyvel', 'pylru', 'aiohttp >= 1'],
     packages=setuptools.find_packages(exclude=['tests']),
     description='ElectrumX Server',
     author='Neil Booth',