diff --git a/README.md b/README.md
index efdb54e1..ec49eebe 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,6 @@ Node for [Squeak protocol](https://github.com/yzernik/squeak/blob/master/docs/PR
 	```
 	[node]
 	network=mainnet
-	tor_proxy_ip=localhost
-	tor_proxy_port=9150
 
 	[lnd]
 	host=localhost
@@ -35,6 +33,10 @@ Node for [Squeak protocol](https://github.com/yzernik/squeak/blob/master/docs/PR
 	rpc_pass=devpass
 	zeromq_hashblock_port=28334
 
+	[tor]
+	proxy_ip=localhost
+	proxy_port=9150
+
 	[webadmin]
 	enabled=true
 	username=devuser
diff --git a/config.ini b/config.ini
index 59b73176..7d9433a7 100644
--- a/config.ini
+++ b/config.ini
@@ -13,6 +13,10 @@ rpc_user=devuser
 rpc_pass=devpass
 zeromq_hashblock_port=28334
 
+[tor]
+proxy_ip=localhost
+proxy_port=9150
+
 [webadmin]
 enabled=true
 username=devuser
diff --git a/docker/config.ini b/docker/config.ini
index bfcd0dd0..07df464b 100644
--- a/docker/config.ini
+++ b/docker/config.ini
@@ -1,7 +1,5 @@
 [node]
 network=testnet
-tor_proxy_ip=tor-socks-proxy
-tor_proxy_port=9150
 
 [lnd]
 host=lnd
@@ -15,6 +13,10 @@ rpc_user=devuser
 rpc_pass=devpass
 zeromq_hashblock_port=28334
 
+[tor]
+proxy_ip=tor-socks-proxy
+proxy_port=9150
+
 [webadmin]
 enabled=true
 username=devuser
diff --git a/squeaknode/config/config.py b/squeaknode/config/config.py
index 52ce25af..4ba8278c 100644
--- a/squeaknode/config/config.py
+++ b/squeaknode/config/config.py
@@ -88,6 +88,12 @@ class LndConfig(Config):
     macaroon_path = key(cast=str, required=False, default="")
 
 
+@section('tor')
+class TorConfig(Config):
+    proxy_ip = key(cast=str, required=False, default="")
+    proxy_port = key(cast=int, required=False, default=0)
+
+
 @section('server')
 class ServerConfig(Config):
     rpc_enabled = key(cast=bool, required=False, default=True)
@@ -140,10 +146,6 @@ class NodeConfig(Config):
         cast=int, required=False, default=DEFAULT_OFFER_DELETION_INTERVAL_S)
     interest_block_interval = key(
         cast=int, required=False, default=DEFAULT_INTEREST_BLOCK_INTERVAL)
-    tor_proxy_ip = key(
-        cast=str, required=False, default="")
-    tor_proxy_port = key(
-        cast=int, required=False, default=0)
     external_address = key(
         cast=str, required=False, default="")
 
@@ -156,6 +158,7 @@ class DbConfig(Config):
 class SqueaknodeConfig(Config):
     bitcoin = group_key(BitcoinConfig)
     lnd = group_key(LndConfig)
+    tor = group_key(TorConfig)
     server = group_key(ServerConfig)
     admin = group_key(AdminConfig)
     webadmin = group_key(WebadminConfig)
diff --git a/squeaknode/network/network_manager.py b/squeaknode/network/network_manager.py
index e9cf4d8b..cf733d3e 100644
--- a/squeaknode/network/network_manager.py
+++ b/squeaknode/network/network_manager.py
@@ -57,8 +57,8 @@ class NetworkManager(object):
         self.local_port = self.config.server.rpc_port or squeak.params.params.DEFAULT_PORT
         self.peer_server = None
         self.peer_client = None
-        self.tor_proxy_ip = self.config.node.tor_proxy_ip
-        self.tor_proxy_port = self.config.node.tor_proxy_port
+        self.tor_proxy_ip = self.config.tor.proxy_ip
+        self.tor_proxy_port = self.config.tor.proxy_port
         self.connection_manager = ConnectionManager(self.local_address)
 
     def start(self, squeak_controller):