    torcontrol
    util
  )
-Index: config/serversettings.cpp
-===================================================================
---- config/serversettings.cpp	(revision 2473)
-+++ config/serversettings.cpp	(working copy)
+Index: src/vidalia/config/serversettings.cpp
+===================================================================
+--- src/vidalia/config/serversettings.cpp	(revision 2473)
++++ src/vidalia/config/serversettings.cpp	(working copy)
 @@ -20,6 +20,7 @@
  
  #include "serversettings.h"

 /** Virtual method called when we retrieve a server-related setting from Tor.
  * Currently this just translates BandwidthFoo to RelayBandwidthFoo when
  * appropriate. */
Index: config/serversettings.h
===================================================================
--- config/serversettings.h	(revision 2473)
+++ config/serversettings.h	(working copy)
@@ -91,6 +91,9 @@
 private:
   /** Returns Tor-recognizable configuration keys and current values. */

+		fflush(stdout);
+		return;
+	}
+	
+	r = UPNP_AddPortMapping(urls.controlURL, data.servicetype,
+	                        port_str, port_str, addr, 0, "TCP");
+	if(r==0)
