diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:54:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:54:33 -0500 |
| commit | d04f21bf394eb9e1781a89d9827476e13cc11086 (patch) | |
| tree | de78da1483e0421c73bc9efad042eccd627f572d /src/or/directory.c | |
| parent | 3b88b638264011158d27d5b451fd07d16f60e16b (diff) | |
| parent | db648fe886fd8ae4f42bb13d0219ca7fa690bdc1 (diff) | |
| download | tor-d04f21bf394eb9e1781a89d9827476e13cc11086.tar.gz tor-d04f21bf394eb9e1781a89d9827476e13cc11086.zip | |
Merge branch 'feature2553-v4-rebased'
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 65d8d953a6..d4abe0243b 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -907,8 +907,12 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, log_debug(LD_DIR, "Initiating %s", dir_conn_purpose_to_string(dir_purpose)); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(is_sensitive_dir_purpose(dir_purpose) && !anonymized_connection)); +#else + (void)is_sensitive_dir_purpose; +#endif /* ensure that we don't make direct connections when a SOCKS server is * configured. */ |