diff options
| author | Werner Koch <[email protected]> | 2016-07-14 13:58:56 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-07-14 13:58:56 +0000 |
| commit | be1e4560d5afb99a6a7b7c639cce980006530a9e (patch) | |
| tree | 0ba98e2dbc56153cb5f6e1c50b2adc259965a40e /dirmngr/server.c | |
| parent | Merge branch 'master' into STABLE-BRANCH-2-2 (diff) | |
| parent | po: Auto-update translations (diff) | |
| download | gnupg-be1e4560d5afb99a6a7b7c639cce980006530a9e.tar.gz gnupg-be1e4560d5afb99a6a7b7c639cce980006530a9e.zip | |
Merge branch 'master' into STABLE-BRANCH-2-2
Diffstat (limited to 'dirmngr/server.c')
| -rw-r--r-- | dirmngr/server.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/dirmngr/server.c b/dirmngr/server.c index d3e57c037..db6f5a8ff 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -274,14 +274,12 @@ strcpy_escaped_plus (char *d, const unsigned char *s) } -/* This fucntion returns true if a Tor server is running. The sattus +/* This function returns true if a Tor server is running. The sattus is cached for the current conenction. */ static int is_tor_running (ctrl_t ctrl) { -#if ASSUAN_VERSION_NUMBER >= 0x020402 - /* Check whether we can connect to the proxy. We use a - special feature introduced with libassuan 2.4.2. */ + /* Check whether we can connect to the proxy. */ if (!ctrl || !ctrl->server_local) return 0; /* Ooops. */ @@ -300,9 +298,6 @@ is_tor_running (ctrl_t ctrl) } } return (ctrl->server_local->tor_state > 0); -#else /* Libassuan < 2.4.2 */ - return 0; /* We don't know. */ -#endif } |