From 918150048a1d677731ab7f2b3f59fa9a7401d435 Mon Sep 17 00:00:00 2001
From: Matt Corallo <matt@bluematt.me>
Date: Wed, 3 Aug 2011 21:02:07 +0200
Subject: [PATCH 1/2] Make it clear that setting proxy requires restart to
 fully apply.

---
 share/uiproject.fbp | 2 +-
 src/uibase.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/uiproject.fbp b/share/uiproject.fbp
index d5e6b1e36..7d2c25841 100644
--- a/share/uiproject.fbp
+++ b/share/uiproject.fbp
@@ -2090,7 +2090,7 @@
                                                                 <property name="font"></property>
                                                                 <property name="hidden">0</property>
                                                                 <property name="id">wxID_ANY</property>
-                                                                <property name="label">&amp;Connect through socks4 proxy: </property>
+                                                                <property name="label">&amp;Connect through socks4 proxy (requires restart to apply): </property>
                                                                 <property name="maximum_size"></property>
                                                                 <property name="minimum_size"></property>
                                                                 <property name="name">m_checkBoxUseProxy</property>
diff --git a/src/uibase.cpp b/src/uibase.cpp
index 18eec4413..6d219ad66 100644
--- a/src/uibase.cpp
+++ b/src/uibase.cpp
@@ -367,7 +367,7 @@ COptionsDialogBase::COptionsDialogBase( wxWindow* parent, wxWindowID id, const w
 	wxBoxSizer* bSizer102;
 	bSizer102 = new wxBoxSizer( wxHORIZONTAL );
 	
-	m_checkBoxUseProxy = new wxCheckBox( m_panelMain, wxID_ANY, _("&Connect through socks4 proxy: "), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxUseProxy = new wxCheckBox( m_panelMain, wxID_ANY, _("&Connect through socks4 proxy (requires restart to apply): "), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer102->Add( m_checkBoxUseProxy, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 	
 	bSizer69->Add( bSizer102, 1, wxEXPAND, 5 );

From 01a509fa2616537a4b444966d6e4e451822b2abd Mon Sep 17 00:00:00 2001
From: Matt Corallo <matt@bluematt.me>
Date: Wed, 3 Aug 2011 21:02:37 +0200
Subject: [PATCH 2/2] Don't listen if on TOR (resolves #441).

---
 src/init.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 266c99202..acfcc44d1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -247,7 +247,8 @@ bool AppInit2(int argc, char* argv[])
     fPrintToDebugger = GetBoolArg("-printtodebugger");
 
     fTestNet = GetBoolArg("-testnet");
-    fNoListen = GetBoolArg("-nolisten");
+    bool fTOR = (fUseProxy && addrProxy.port == htons(9050));
+    fNoListen = GetBoolArg("-nolisten") || fTOR;
     fLogTimestamps = GetBoolArg("-logtimestamps");
 
     for (int i = 1; i < argc; i++)