Merge remote-tracking branch 'sebastian/bug4469'

changes/bug4469

@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix a couple of compile warnings on Windows. Fixes bug 4469; bugfix
+      on 0.2.3.4-alpha and 0.2.3.6-alpha.
+

src/common/util.c

@@ -3228,6 +3228,8 @@ tor_spawn_background(const char *const filename, const char **argv,
   SECURITY_ATTRIBUTES saAttr;
   char *joined_argv;
 
+  (void)envp; // Unused on Windows
+
   /* process_handle must not be NULL */
   tor_assert(process_handle != NULL);
 

src/or/connection.c

@@ -996,6 +996,8 @@ connection_create_listener(const struct sockaddr *listensockaddr,
       tor_close_socket(s);
       goto err;
     }
+#else
+    (void)options;
 #endif /* HAVE_SYS_UN_H */
   } else {
       log_err(LD_BUG,"Got unexpected address family %d.",