Merge remote-tracking branch 'weasel/bug18261'

changes/bug18261

@@ -0,0 +1,6 @@
+  o Minor features (crypto):
+    - Fix a segfault during startup:  If unix socket was configured as
+      listener (such as a ControlSocket or a SocksPort unix socket), and
+      tor was started as root but not configured to switch to another
+      user, tor would segfault while trying to string compare a NULL
+      value.  Fixes bug 18261; bugfix on 0.2.8.1-alpha. Patch by weasel.

src/or/connection.c

@@ -2397,7 +2397,7 @@ retry_listener_ports(smartlist_t *old_conns,
     /* We don't need to be root to create a UNIX socket, so defer until after
      * setuid. */
     const or_options_t *options = get_options();
-    if (port->is_unix_addr && !geteuid() && strcmp(options->User, "root"))
+    if (port->is_unix_addr && !geteuid() && (options->User) && strcmp(options->User, "root"))
       continue;
 #endif