diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-10-28 08:47:57 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-10-28 08:47:57 -0400 |
| commit | b98631d28082fd17a7568d693ebe97b4986fce56 (patch) | |
| tree | 55b32b992e1e6fcf9883d40c0653994be227b709 /src/feature/client | |
| parent | 25d66a33911df8561765b58b08d691b4afd36344 (diff) | |
| parent | bc4b9d7df48106cb4cba4c3a288510038d7faea3 (diff) | |
| download | tor-b98631d28082fd17a7568d693ebe97b4986fce56.tar.gz tor-b98631d28082fd17a7568d693ebe97b4986fce56.zip | |
Merge branch 'tor-github/pr/1476'
Diffstat (limited to 'src/feature/client')
| -rw-r--r-- | src/feature/client/addressmap.h | 6 | ||||
| -rw-r--r-- | src/feature/client/proxymode.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/feature/client/addressmap.h b/src/feature/client/addressmap.h index 9179aef1d0..eb9742c50b 100644 --- a/src/feature/client/addressmap.h +++ b/src/feature/client/addressmap.h @@ -4,6 +4,11 @@ * Copyright (c) 2007-2019, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * @file addressmap.h + * @brief Header for addressmap.c + **/ + #ifndef TOR_ADDRESSMAP_H #define TOR_ADDRESSMAP_H @@ -62,4 +67,3 @@ STATIC void get_random_virtual_addr(const virtual_addr_conf_t *conf, #endif /* defined(ADDRESSMAP_PRIVATE) */ #endif /* !defined(TOR_ADDRESSMAP_H) */ - diff --git a/src/feature/client/proxymode.c b/src/feature/client/proxymode.c index 3b5fba5cda..0682205336 100644 --- a/src/feature/client/proxymode.c +++ b/src/feature/client/proxymode.c @@ -4,6 +4,11 @@ * Copyright (c) 2007-2019, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * @file proxymode.c + * @brief Determine whether we are trying to be a proxy. + **/ + #include "core/or/or.h" #include "app/config/config.h" |