summaryrefslogtreecommitdiffstats
path: root/doc/dirmngr.texi
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2017-07-26 10:58:15 +0200
committerWerner Koch <wk@gnupg.org>2017-07-26 10:58:15 +0200
commitfd68bdb61ec4f8441da6d3023a8da4315df54cec (patch)
treef832e63f5887ea1e380989857315dfb152fbac0c /doc/dirmngr.texi
parentagent,dirmngr: Check for homedir removal also using stat(2). (diff)
downloadgnupg2-fd68bdb61ec4f8441da6d3023a8da4315df54cec.tar.xz
gnupg2-fd68bdb61ec4f8441da6d3023a8da4315df54cec.zip
dirmngr: Auto-enable Tor on startup or reload.
* dirmngr/dirmngr.c (dirmngr_use_tor): Test for Tor availibility. -- GnuPG-bug-id: 2935 Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to '')
-rw-r--r--doc/dirmngr.texi12
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 64b24f9f7..eef78a8b7 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -243,10 +243,16 @@ Enabling this option forces loading of expired CRLs; this is only
useful for debugging.
@item --use-tor
+@itemx --no-use-tor
@opindex use-tor
-This option switches Dirmngr and thus GnuPG into ``Tor mode'' to route
-all network access via Tor (an anonymity network). Certain other
-features are disabled if this mode is active.
+@opindex no-use-tor
+The option @option{--use-tor} switches Dirmngr and thus GnuPG into
+``Tor mode'' to route all network access via Tor (an anonymity
+network). Certain other features are disabled in this mode. The
+effect of @option{--use-tor} cannot be overridden by any other command
+or even be reloading gpg-agent. The use of @option{--no-use-tor}
+disables the use of Tor. The default is to use Tor if it is available
+on startup or after reloading dirmngr.
@item --standard-resolver
@opindex standard-resolver