From: Roger Dingledine <arma@torproject.org>
Date: Wed, 5 Sep 2012 08:46:27 +0000 (-0400)
Subject: minor typos i found while constructing the changelog
X-Git-Tag: tor-0.2.4.1-alpha~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67065c3c0675114f09b065d442407c6890c369d8;p=thirdparty%2Ftor.git

minor typos i found while constructing the changelog
---

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 68898eb88f..5e76105d2b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1174,7 +1174,7 @@ The following options are useful only for clients (that is, if
 **ClientUseIPv6** **0**|**1**::
     If this option is set to 1, Tor might connect to entry nodes over
     IPv6. Note that clients configured with an IPv6 address in a
-    **Bridge** option will try connecting over IPv6 if even if
+    **Bridge** line will try connecting over IPv6 even if
     **ClientUseIPv6** is set to 0. (Default: 0)
 
 **ClientPreferIPv6ORPort** **0**|**1**::
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index e35039bdb8..b96491f5f9 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -815,9 +815,9 @@ node_get_declared_family(const node_t *node)
  * <b>node</b>, else 0.
  *
  *  We prefer the IPv6 address if the router has an IPv6 address and
- *  i) the node_t says that we do prefer IPv6
+ *  i) the node_t says that it prefers IPv6
  *  or
- *  ii) the router has no IPv4 address.  */
+ *  ii) the router has no IPv4 address. */
 int
 node_ipv6_preferred(const node_t *node)
 {