[tor-commits] [tor/master] Fix two wide lines in config.c

[nickm@xxxxxxxxxxxxxx]

commit 6a468a1722b074807eba7a0065ca6df8e2125745
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Dec 13 12:44:17 2012 -0500

    Fix two wide lines in config.c
---
 src/or/config.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 59b4abd..acfe2c4 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -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? */
   if ((options->DirAuthorities &&
        (!old_options ||
-        !config_lines_eq(options->DirAuthorities, old_options->DirAuthorities))) ||
+        !config_lines_eq(options->DirAuthorities,
+                         old_options->DirAuthorities))) ||
       (options->AlternateDirAuthority &&
        (!old_options ||
         !config_lines_eq(options->AlternateDirAuthority,
@@ -1955,8 +1956,8 @@ resolve_my_address(int warn_severity, const or_options_t *options,
        * always. */
       log_fn(warn_severity, LD_CONFIG,
              "Address '%s' resolves to private IP address '%s'. "
-             "Tor servers that use the default DirAuthorities must have public "
-             "IP addresses.", hostname, addr_string);
+             "Tor servers that use the default DirAuthorities must have "
+             "public IP addresses.", hostname, addr_string);
       tor_free(addr_string);
       return -1;
     }

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits