[git] GnuPG - branch, master, updated. gnupg-2.1.18-39-gb0e8376

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  b0e8376e19072ec3c590273c69ab3e8e5edfdaca (commit)
      from  e17fa5c75d76af4d4684ee810cb446ecd5110560 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b0e8376e19072ec3c590273c69ab3e8e5edfdaca
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jan 31 13:22:52 2017 +0100

    dirmngr: Require --allow-version-check even if --use-tor is used.
    
    * dirmngr/dirmngr.c (housekeeping_thread): Load swdb only if the
    option is set.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 15ba33b..7e640d4 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1798,7 +1798,7 @@ housekeeping_thread (void *arg)
   if (network_activity_seen)
     {
       network_activity_seen = 0;
-      if (opt.use_tor || opt.allow_version_check)
+      if (opt.allow_version_check)
         dirmngr_load_swdb (&ctrlbuf, 0);
     }
 
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index fcc174f..7fc11a2 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -266,8 +266,8 @@ seconds.
 @item --allow-version-check
 @opindex allow-version-check
 Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get
-the list of current software versions.  If this option is enabled, or
-if @option{use-tor} is active, the list is retrieved when the local
+the list of current software versions.  If this option is enabled
+the list is retrieved in case the local
 copy does not exist or is older than 5 to 7 days.  See the option
 @option{--query-swdb} of the command @command{gpgconf} for more
 details.  Note, that regardless of this option a version check can

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/dirmngr.c | 2 +-
 doc/dirmngr.texi  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org