From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 13 Dec 2012 17:44:17 +0000 (-0500)
Subject: Fix two wide lines in config.c
X-Git-Tag: tor-0.2.4.7-alpha~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a468a1722b074807eba7a0065ca6df8e2125745;p=thirdparty%2Ftor.git

Fix two wide lines in config.c
---

diff --git a/src/or/config.c b/src/or/config.c
index 59b4abdfb0..acfe2c4f83 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;
     }