Merge remote-tracking branch 'public/owning_control_fd'

diff --cc src/or/config.c
index c4d2062c836536bf7ff8c50777a0145e18a14355,acc31c0111fb4e8d9ab9b277513a175f628fc7bf..b09603f5c106c5c2f11062770492aa6a0760754f
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -1770,9 -1729,26 +1771,27 @@@ options_act(const or_options_t *old_opt
      log_warn(LD_BUG, "Previously validated client authorization for "
                       "hidden services could not be added!");
      return -1;
 +    // LCOV_EXCL_STOP
    }
  
+   if (running_tor && !old_options && options->OwningControllerFD != -1) {
+ #ifdef _WIN32
+     log_warn(LD_CONFIG, "OwningControllerFD is not supported on Windows. "
+              "If you neeed it, tell the Tor developers.");
+     return -1;
+ #else
+     const unsigned ctrl_flags =
+       CC_LOCAL_FD_IS_OWNER |
+       CC_LOCAL_FD_IS_AUTHENTICATED;
+     tor_socket_t ctrl_sock = (tor_socket_t)options->OwningControllerFD;
+     if (control_connection_add_local_fd(ctrl_sock, ctrl_flags) < 0) {
+       log_warn(LD_CONFIG, "Could not add local controller connection with "
+                "given FD.");
+       return -1;
+     }
+ #endif
+   }
+ 
    /* Load state */
    if (! or_state_loaded() && running_tor) {
      if (or_state_load())

diff --cc src/or/control.c
Simple merge

diff --cc src/or/or.h
Simple merge