Merge branch 'tor_api_owning_control'

diff --cc src/app/config/config.c
Simple merge

diff --cc src/app/config/or_options_st.h
Simple merge

diff --cc src/core/mainloop/main.c
index c648d236bb6380065f68cc1ac62718fc16c4a01c,4bb55c7ba63cbe4b3a4b0f0da4a9f710c1faa32c..27c4a9b3bfee619f6174f1eeb4a5fef7782c3668
--- 1/src/core/mainloop/main.c
--- 2/src/core/mainloop/main.c
+++ b/src/core/mainloop/main.c
@@@ -4251,9 -4258,12 +4258,10 @@@ tor_run_main(const tor_main_configurati
  #endif /* defined(NT_SERVICE) */
    {
      int init_rv = tor_init(argc, argv);
 -    if (init_rv < 0) {
 -      result = -1;
 -      goto done;
 -    } else if (init_rv > 0) {
 -      result = 0;
 +    if (init_rv) {
 +      tor_free_all(0);
-       return (init_rv < 0) ? -1 : 0;
++      result = (init_rv < 0) ? -1 : 0;
+       goto done;
      }
    }
  
@@@ -4261,8 -4271,8 +4269,9 @@@
      sandbox_cfg_t* cfg = sandbox_init_filter();
  
      if (sandbox_init(cfg)) {
+       tor_free(argv);
        log_err(LD_BUG,"Failed to create syscall sandbox filter");
 +      tor_free_all(0);
        return -1;
      }
  

diff --cc src/feature/api/tor_api.c
Simple merge

diff --cc src/feature/api/tor_api.h
Simple merge

diff --cc src/test/test_util.c
Simple merge

diff --cc src/tools/tor_runner.c
Simple merge