[tor-commits] [torspec/master] Actually, this patch is going into 0.2.6.2-alpha, not 0.2.6.1-alpha

[nickm@xxxxxxxxxxxxxx]

commit 9098fab087224611617a4cf076716c67f25eeed4
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Dec 30 09:56:14 2014 -0500

    Actually, this patch is going into 0.2.6.2-alpha, not 0.2.6.1-alpha
---
 control-spec.txt |   16 ++++++++--------
 dir-spec.txt     |    2 +-
 path-spec.txt    |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt
index 04fa34e..88319ff 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -1873,7 +1873,7 @@
      ENOUGH_DIR_INFO
        Tor now knows enough network-status documents and enough server
        descriptors that it's going to start trying to build circuits now.
-      [Newer versions of Tor (0.2.6.1-alpha and later):
+      [Newer versions of Tor (0.2.6.2-alpha and later):
        If the consensus contains Exits (the typical case), Tor will build
        both exit and internal circuits. If not, Tor will only build internal
        circuits.]
@@ -2621,7 +2621,7 @@
   Future Tors MAY revisit earlier stages.
  [XXXX: do we revisit earlier stages if the network fails?]
 
- [Newer versions of Tor (0.2.6.1-alpha and later):
+ [Newer versions of Tor (0.2.6.2-alpha and later):
   If the consensus contains Exits (the typical case), Tor will build both
   exit and internal circuits. When bootstrap completes, Tor will be ready
   to handle an application requesting an exit circuit to services like the
@@ -2710,7 +2710,7 @@
   phase until we have received a 'connected' relay cell in response to
   a request for descriptors.
 
- [Newer versions of Tor (0.2.6.1-alpha and later):
+ [Newer versions of Tor (0.2.6.2-alpha and later):
   If the consensus contains Exits (the typical case), Tor will ask for
   descriptors for both exit and internal paths. If not, Tor will only ask
   for descriptors for internal paths. In this case, this status will
@@ -2729,7 +2729,7 @@
   This phase is also a good opportunity to use the "progress" keyword to
   indicate partial steps.
 
- [Newer versions of Tor (0.2.6.1-alpha and later):
+ [Newer versions of Tor (0.2.6.2-alpha and later):
   If the consensus contains Exits (the typical case), Tor will download
   descriptors for both exit and internal paths. If not, Tor will only
   download descriptors for internal paths. In this case, this status will
@@ -2746,7 +2746,7 @@
   If a Tor starts with enough recent cached directory information,
   its first bootstrap status event will be for the conn_or phase.
 
- [Newer versions of Tor (0.2.6.1-alpha and later):
+ [Newer versions of Tor (0.2.6.2-alpha and later):
   If the consensus contains Exits (the typical case), Tor will build both
   exit and internal circuits. If not, Tor will only build internal circuits.
   In this case, this status will include "internal(ly)" as indicated above.]
@@ -2760,7 +2760,7 @@
   the "conn_or" phase. We'll stay in this phase until we complete a TLS
   handshake with a Tor relay.
 
- [Newer versions of Tor (0.2.6.1-alpha and later):
+ [Newer versions of Tor (0.2.6.2-alpha and later):
   If the consensus contains Exits (the typical case), Tor may be finishing
   a handshake with the first hop if either an exit or internal circuit. In
   this case, it won't specify which type. If the consensus contains no Exits,
@@ -2774,7 +2774,7 @@
   we will set about trying to make some 3-hop circuits in case we need them
   soon.
 
- [Newer versions of Tor (0.2.6.1-alpha and later):
+ [Newer versions of Tor (0.2.6.2-alpha and later):
   If the consensus contains Exits (the typical case), Tor will build both
   exit and internal circuits. If not, Tor will only build internal circuits.
   In this case, this status will include "internal" as indicated above.]
@@ -2785,7 +2785,7 @@
   A full 3-hop circuit has been established. Tor is ready to handle
   application connections now.
 
- [Newer versions of Tor (0.2.6.1-alpha and later):
+ [Newer versions of Tor (0.2.6.2-alpha and later):
   If the consensus contains Exits (the typical case), Tor will build both
   exit and internal circuits. At this stage, Tor will be ready to handle
   an application requesting an exit circuit to services like the World
diff --git a/dir-spec.txt b/dir-spec.txt
index 9049c35..1fdafbd 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -2693,7 +2693,7 @@
    are running (this is configurable using torrc options and consensus
    parameters).
 
-  [Newer versions of Tor (0.2.6.1-alpha and later):
+  [Newer versions of Tor (0.2.6.2-alpha and later):
    If the consensus contains Exits (the typical case), Tor will build both
    exit and internal circuits. When bootstrap completes, Tor will be ready
    to handle an application requesting an exit circuit to services like the
diff --git a/path-spec.txt b/path-spec.txt
index 192bbc7..64886dc 100644
--- a/path-spec.txt
+++ b/path-spec.txt
@@ -28,7 +28,7 @@ of their choices.
    that no current circuit can handle, for testing the network or our
    reachability, and so on).
 
-  [Newer versions of Tor (0.2.6.1-alpha and later):
+  [Newer versions of Tor (0.2.6.2-alpha and later):
    If the consensus contains Exits (the typical case), Tor will build both
    exit and internal circuits. When bootstrap completes, Tor will be ready
    to handle an application requesting an exit circuit to services like the

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