mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix two wide lines in config.c

Browse source
This commit is contained in:
Nick Mathewson 2012-12-13 12:44:17 -05:00
parent 01ac961ca1
commit 6a468a1722
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/or/config.c
View file

@ -829,7 +829,8 @@ validate_dir_servers(or_options_t *options, or_options_t *old_options)
/* do we want to complain to the user about being partitionable? */ /* do we want to complain to the user about being partitionable? */
if ((options->DirAuthorities && if ((options->DirAuthorities &&
(!old_options || (!old_options ||
!config_lines_eq(options->DirAuthorities, old_options->DirAuthorities))) || !config_lines_eq(options->DirAuthorities,
old_options->DirAuthorities))) ||
(options->AlternateDirAuthority && (options->AlternateDirAuthority &&
(!old_options || (!old_options ||
!config_lines_eq(options->AlternateDirAuthority, !config_lines_eq(options->AlternateDirAuthority,
@ -1955,8 +1956,8 @@ resolve_my_address(int warn_severity, const or_options_t *options,
* always. */ * always. */
log_fn(warn_severity, LD_CONFIG, log_fn(warn_severity, LD_CONFIG,
"Address '%s' resolves to private IP address '%s'. " "Address '%s' resolves to private IP address '%s'. "
"Tor servers that use the default DirAuthorities must have public " "Tor servers that use the default DirAuthorities must have "
"IP addresses.", hostname, addr_string); "public IP addresses.", hostname, addr_string);
tor_free(addr_string); tor_free(addr_string);
return -1; return -1;
} }