Merge branch 'maint-0.3.4'

diff --cc src/core/mainloop/main.c
index 2a1ef0ba74eabca958bd4d23976435f5b831de9b,a93fdc3922e98fb84b61a7d5e286c9c6f0121448..781e093d90eb6d7e5604df2e779dfbf9636403d5
--- 1/src/core/mainloop/main.c
--- 2/src/or/main.c
+++ b/src/core/mainloop/main.c
@@@ -4225,15 -4226,10 +4232,16 @@@ tor_run_main(const tor_main_configurati
        setdeppolicy(3);
      }
    }
+ #endif /* !defined(_WIN64) */
  #endif /* defined(_WIN32) */
  
 -  configure_backtrace_handler(get_version());
 +  {
 +    int bt_err = configure_backtrace_handler(get_version());
 +    if (bt_err < 0) {
 +      log_warn(LD_BUG, "Unable to install backtrace handler: %s",
 +               strerror(-bt_err));
 +    }
 +  }
    init_protocol_warning_severity_level();
  
    update_approx_time(time(NULL));