 Index: INSTALL
 ===================================================================
---- INSTALL	(revision 2423)
+--- INSTALL	(revision 2465)
 +++ INSTALL	(working copy)
-@@ -205,3 +205,7 @@
+@@ -206,3 +206,8 @@
  'cmake --help' or 'man cmake' (on non-Windows platforms) for more information
  about supported generators and configuration options.
  
 +Including UPnP support
 +----------------------
 +
-+cmake -G "MSYS Makefiles" -DMINIUPNPC_LIBRARY_DIR="/usr/local/lib" -DMINIUPNPC_INCLUDE_DIR="/usr/local/include" .
-\ No newline at end of file
++cmake -G "MSYS Makefiles" -DMINIUPNPC_LIBRARY_DIR="/usr/local/lib" -DMINIUPNPC_INCLUDE_DIR="/usr/local/include" .
++
 Index: src/vidalia/CMakeLists.txt
 ===================================================================
---- src/vidalia/CMakeLists.txt	(revision 2423)
+--- src/vidalia/CMakeLists.txt	(revision 2465)
 +++ src/vidalia/CMakeLists.txt	(working copy)
 @@ -16,6 +16,7 @@
    ${CMAKE_CURRENT_SOURCE_DIR}

   torcontrol
   util
 )
Index: src/vidalia/config/serversettings.cpp
===================================================================
--- src/vidalia/config/serversettings.cpp	(revision 2423)
+++ src/vidalia/config/serversettings.cpp	(working copy)
@@ -130,6 +130,9 @@
   bool rc;

     rc = torControl()->setConf(confValues(), errmsg);
   } else { 
     QStringList resetKeys;
@@ -152,6 +155,72 @@
   return rc;
 }
 
