fix wide lines

svn:r17198

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index f4ea3e8d84f7a10825aef745fb13c3f6592220cc..ed544715e9dc421959edd8b78930c2fb79179372 100644 (file)
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1074,10 +1074,11 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn,
       uint32_t addr = 0;
       if (tor_inet_aton(conn->socks_request->address, &in))
         addr = ntohl(in.s_addr);
-      if (router_exit_policy_all_routers_reject(addr, conn->socks_request->port,
+      if (router_exit_policy_all_routers_reject(addr,
+                                                conn->socks_request->port,
                                                 need_uptime)) {
         log_notice(LD_APP,
-                   "No Tor server exists that allows exit to %s:%d. Rejecting.",
+                   "No Tor server allows exit to %s:%d. Rejecting.",
                    safe_str(conn->socks_request->address),
                    conn->socks_request->port);
         return -1;

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index d8872fb11e26ef5b23a1dada80846b1c62108111..f139c5e79ba577ad0b11c32cc7bcb9639ccc11ed 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1814,7 +1814,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl)
       "Cutoffs: For Stable, %lu sec uptime, %lu sec MTBF. "
       "For Fast: %lu bytes/sec. "
       "For Guard: WFU %.03lf%%, time-known %lu sec, "
-      "and bandwidth %lu or %lu bytes/sec. We do%s have enough stability data.",
+      "and bandwidth %lu or %lu bytes/sec. We%s have enough stability data.",
       (unsigned long)stable_uptime,
       (unsigned long)stable_mtbf,
       (unsigned long)fast_bandwidth,
@@ -1822,7 +1822,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl)
       (unsigned long)guard_tk,
       (unsigned long)guard_bandwidth_including_exits,
       (unsigned long)guard_bandwidth_excluding_exits,
-      enough_mtbf_info ? "" : "not ");
+      enough_mtbf_info ? "" : "don't ");
 
   tor_free(uptimes);
   tor_free(mtbfs);

diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 46017f89cb04a0f8121c098764753fadd8254ba1..c8de359843e45ccf26184a0ebc05b465cd6097ac 100644 (file)
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -255,7 +255,8 @@ dnsserv_resolved(edge_connection_t *conn,
   int err = DNS_ERR_NONE;
   if (!req)
     return;
-  name = evdns_get_orig_address(req, answer_type, conn->socks_request->address);
+  name = evdns_get_orig_address(req, answer_type,
+                                conn->socks_request->address);
 
   /* XXXX021 Re-do; this is dumb. */
   if (ttl < 60)

diff --git a/src/or/or.h b/src/or/or.h
index 4d1b7de2fe56defd55a0116756972b5031a8a87e..5a1d611feca036482a90b1fa4a38dcf856a712bf 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4223,10 +4223,12 @@ typedef enum {
   CRN_NEED_CAPACITY = 1<<1,
   CRN_NEED_GUARD = 1<<2,
   CRN_ALLOW_INVALID = 1<<3,
+#if 0
   /* XXXX021 not used, apparently. */
   CRN_STRICT_PREFERRED = 1<<4,
   /* XXXX021 not used, apparently. */
   CRN_WEIGHT_AS_EXIT = 1<<5
+#endif
 } router_crn_flags_t;
 
 routerinfo_t *router_choose_random_node(const char *preferred,