backport r11864

svn:r11865

ChangeLog

@@ -12,6 +12,8 @@ Changes in version 0.1.2.18 - 2007-??-??
       bug 467.)
     - Fix a user-triggerable segfault in expand_filename().  (There isn't
       a way to trigger this remotely.)
+    - Fix a minor memory leak whenever a controller sends the PROTOCOLINFO
+      command. Bugfix on 0.1.2.17.
 
   o Minor bugfixes (controller):
     - When sending a status event to the controller telling it that an

src/or/control.c

@@ -2268,6 +2268,7 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len,
                              cookies?" COOKIEFILE=":"",
                              cookies?esc_cfile:"",
                              escaped(VERSION));
+    tor_free(methods);
     tor_free(cfile);
     tor_free(esc_cfile);
   }