summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2019-03-22 18:00:05 -0700
committerGitHub <noreply@github.com>2019-03-22 18:00:05 -0700
commitc1023647d1850c64a20514721d4397ff3c360671 (patch)
tree34fae23b20add4780e71ffeaf6f8c65f21ce4afe /share
parenta9f3accf69e1560404433137dd2d84433171170d (diff)
parent9a66e331b40311db59f0f4fdc503841233b07d24 (diff)
downloadonionshare-c1023647d1850c64a20514721d4397ff3c360671.tar.gz
onionshare-c1023647d1850c64a20514721d4397ff3c360671.zip
Merge pull request #941 from mig5/configurable_connect_timeout
Allow the bundled Tor connection timeout to be configurable from the CLI
Diffstat (limited to 'share')
-rw-r--r--share/locale/en.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/share/locale/en.json b/share/locale/en.json
index f7af9a80..9dd0648e 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -16,6 +16,7 @@
"help_local_only": "Don't use Tor (only for development)",
"help_stay_open": "Continue sharing after files have been sent",
"help_shutdown_timeout": "Stop sharing after a given amount of seconds",
+ "help_connect_timeout": "Give up connecting to Tor after a given amount of seconds (default: 120)",
"help_stealth": "Use client authorization (advanced)",
"help_receive": "Receive shares instead of sending them",
"help_debug": "Log OnionShare errors to stdout, and web errors to disk",