Merge branch 'maint-0.2.4' into release-0.2.4

changes/bug9122

@@ -0,0 +1,4 @@
+  o Major bugfixes:
+    - When receiving a new configuration file via the control port's
+      LOADCONF command, do not treat the defaults file as absent.
+      Fixes bug 9122; bugfix on 0.2.3.9-alpha.

changes/bug9147

@@ -0,0 +1,4 @@
+  o Minor features:
+    - Issue a warning when running with the bufferevents backend enabled.
+      It's still not stable, and people should know that they're likely
+      to hit unexpected problems. Closes ticket 9147.

src/or/config.c

@@ -3785,6 +3785,10 @@ options_init_from_string(const char *cf_defaults, const char *cf,
       newdefaultoptions = config_dup(&options_format, newoptions);
   }
 
+  if (newdefaultoptions == NULL) {
+    newdefaultoptions = config_dup(&options_format, global_default_options);
+  }
+
   /* Go through command-line variables too */
   retval = config_assign(&options_format, newoptions,
                          global_cmdline_options, 0, 0, msg);

src/or/main.c

@@ -1882,6 +1882,13 @@ do_main_loop(void)
     }
   }
 
+#ifdef USE_BUFFEREVENTS
+  log_warn(LD_GENERAL, "Tor was compiled with the --enable-bufferevents "
+           "option. This is still experimental, and might cause strange "
+           "bugs. If you want a more stable Tor, be sure to build without "
+           "--enable-bufferevents.");
+#endif
+
   handle_signals(1);
 
   /* load the private keys, if we're supposed to have them, and set up the