Merge branch 'scan-build-032'

diff --cc src/common/buffers.c
Simple merge

diff --cc src/common/compat.c
index d377c922c8c1db969a438878e29574050f2ebad7,ab117f7c72ee4962c4edd4db7ee58fa6c83592b9..ab1fbc64fe1cc450c51cd44089ec50139b3f1fca
--- 1/src/common/compat.c
--- 2/src/common/compat.c
+++ b/src/common/compat.c
@@@ -2242,17 -2239,15 +2240,14 @@@ tor_disable_debugger_attach(void
    log_debug(LD_CONFIG,
              "Attemping to disable debugger attachment to Tor for "
              "unprivileged users.");
 -#if defined(__linux__) && defined(HAVE_SYS_PRCTL_H) && defined(HAVE_PRCTL)
 -#ifdef PR_SET_DUMPABLE
 +#if defined(__linux__) && defined(HAVE_SYS_PRCTL_H) \
 +  && defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
-   attempted = 1;
+ #define TRIED_TO_DISABLE
    r = prctl(PR_SET_DUMPABLE, 0);
--#endif
- #if defined(__APPLE__) && defined(PT_DENY_ATTACH)
-   if (r < 0) {
-     attempted = 1;
-     r = ptrace(PT_DENY_ATTACH, 0, 0, 0);
-   }
- #endif /* defined(__APPLE__) && defined(PT_DENY_ATTACH) */
+ #elif defined(__APPLE__) && defined(PT_DENY_ATTACH)
 -#define TRIED_TO_DISABLE
++#define TRIED_TO_ATTACH
+   r = ptrace(PT_DENY_ATTACH, 0, 0, 0);
 -#endif
++#endif /* defined(__linux__) && defined(HAVE_SYS_PRCTL_H) ... || ... */
  
    // XXX: TODO - Mac OS X has dtrace and this may be disabled.
    // XXX: TODO - Windows probably has something similar
@@@ -2264,6 -2260,8 +2260,8 @@@
      log_warn(LD_CONFIG, "Unable to disable debugger attaching: %s",
               strerror(errno));
    }
 -#endif
++#endif /* defined(TRIED_TO_DISABLE) */
+ #undef TRIED_TO_DISABLE
    return r;
  }
  

diff --cc src/common/timers.c
Simple merge

diff --cc src/common/util.c
index b262691d7293966fa54163a738431588c9c8737a,c8358ea705e823a3e92101479f2ff51a2a1b59cc..bcb1449a18578bcbd2b56c8896387107234a8ba6
--- 1/src/common/util.c
--- 2/src/common/util.c
+++ b/src/common/util.c
@@@ -4383,11 -4376,11 +4382,11 @@@ tor_spawn_background(const char *const 
                 "Cannot find maximum file descriptor, assuming %d", max_fd);
      }
    }
 -#else
 +#else /* !(defined(_SC_OPEN_MAX)) */
    max_fd = DEFAULT_MAX_FD;
 -#endif
 +#endif /* defined(_SC_OPEN_MAX) */
  
-   child_state = CHILD_STATE_FORK;
+   // child_state = CHILD_STATE_FORK;
  
    pid = fork();
    if (0 == pid) {
@@@ -4540,8 -4535,8 +4541,8 @@@
    }
  
    *process_handle_out = process_handle;
-   return process_handle->status;
+   return status;
 -#endif // _WIN32
 +#endif /* defined(_WIN32) */
  }
  
  /** Destroy all resources allocated by the process handle in

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc src/test/test_hs_common.c
index 2d63dff250dec94681176b8f93fee7faac1b715d,3cacbab0f0c599e5583950c9269b81564b2cdc62..22fed12f1e69058360e069fc6bb6f0888582e03d
--- 1/src/test/test_hs_common.c
--- 2/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@@ -1588,7 -1512,7 +1589,7 @@@ helper_test_hsdir_sync(networkstatus_t 
    tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6);
  
    /* 3) Initialize client time */
-   now = helper_set_consensus_and_system_time(ns, client_position);
 -  helper_set_consensus_and_system_time(ns, client_between_srv_and_tp);
++  helper_set_consensus_and_system_time(ns, client_position);
  
    cleanup_nodelist();
    SMARTLIST_FOREACH(ns->routerstatus_list,

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

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

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