[tor-commits] [torspec/master] mention ipv6 addresses in net/listeners/* doc

[nickm at torproject.org]

commit 398c01be40f957c07d23b4ef6192214aee505703
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 12 12:27:59 2014 -0400

    mention ipv6 addresses in net/listeners/* doc
---
 control-spec.txt               |    6 +++++-
 proposals/224-rend-spec-ng.txt |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt
index b201445..f9c4934 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -756,7 +756,7 @@
     "net/listeners/dns"
     "net/listeners/control"
       A quoted, space-separated list of the locations where Tor is listening
-      for connections of the specified type. These can contain both IPv4
+      for connections of the specified type. These can contain IPv4
       network address...
 
         "127.0.0.1:9050" "127.0.0.1:9051"
@@ -765,6 +765,10 @@
 
         "unix:/home/my_user/.tor/socket"
 
+      ... or IPv6 network addresses:
+
+        "[2001:0db8:7000:0000:0000:dead:beef:1234]:9050"
+
       [New in Tor 0.2.2.26-beta.]
 
     "dir-usage"
diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt
index dc8b7b2..b8f0f04 100644
--- a/proposals/224-rend-spec-ng.txt
+++ b/proposals/224-rend-spec-ng.txt
@@ -1381,7 +1381,7 @@ Status: Draft
                EXT_FIELD_TYPE           [1 byte]
                EXT_FIELD_LEN            [1 byte]
                EXT_FIELD                [EXTRA_FIELD_LEN bytes]
-               ZERO                     [1 byte]
+            ZERO                        [1 byte]
             ENCRYPTED:
                CLIENT_PK                [G_LENGTH bytes]
                ENCRYPTED_DATA           [Padded to length of plaintext]