 -	sprintf(port_str, "%d", port);
 -	UPNP_DeletePortMapping(urls.controlURL, data.servicetype, port_str, "TCP");
 -}
-Index: src/vidalia/config/upnpcontrol.h
-===================================================================
---- src/vidalia/config/upnpcontrol.h	(revision 2498)
-+++ src/vidalia/config/upnpcontrol.h	(working copy)
-@@ -31,6 +31,7 @@
+Index: src/vidalia/config/upnpcontrol.h
+===================================================================
+--- src/vidalia/config/upnpcontrol.h	(revision 2498)
++++ src/vidalia/config/upnpcontrol.h	(working copy)
+@@ -31,6 +31,7 @@
  public:
    static UPNPControl* Instance();
    int forwardPort(quint16 port);

 #endif
 }
 
Index: src/vidalia/config/serversettings.h
===================================================================
--- src/vidalia/config/serversettings.h	(revision 2498)
+++ src/vidalia/config/serversettings.h	(working copy)
@@ -93,7 +93,7 @@
   QHash<QString,QString> confValues();
 
   /** Configure UPnP device to forward DirPort and ORPort */

 /** Based on http://miniupnp.free.fr/files/download.php?file=xchat-upnp20061022.patch */
 void
 UPNPControl::init_upnp()
@@ -78,52 +112,13 @@
   struct UPNPDev * devlist;
   int retval;
 
