aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug116095
-rw-r--r--src/or/main.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug11609 b/changes/bug11609
new file mode 100644
index 000000000..2a116137c
--- /dev/null
+++ b/changes/bug11609
@@ -0,0 +1,5 @@
+ o Minor bugfixes (sandbox):
+ - Don't try to enable the sandbox when using the Tor binary to
+ check its configuration, hash a passphrase, or so on. Doing
+ so was crashing on startup for some users. Fixes bug 11609;
+ bugfix on 0.2.5.1-alpha.
diff --git a/src/or/main.c b/src/or/main.c
index 6713d8036..1e591577f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2938,7 +2938,7 @@ tor_main(int argc, char *argv[])
if (tor_init(argc, argv)<0)
return -1;
- if (get_options()->Sandbox) {
+ if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) {
sandbox_cfg_t* cfg = sandbox_init_filter();
if (sandbox_init(cfg)) {