aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dir-spec.txt8
-rw-r--r--proposals/000-index.txt4
-rw-r--r--proposals/186-multiple-orports.txt2
3 files changed, 6 insertions, 8 deletions
diff --git a/dir-spec.txt b/dir-spec.txt
index bdb25de..7c4bfde 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -589,15 +589,13 @@
included for specialized controllers designed to support perspective
access and such.
- "or-address" SP ADDRESS ":" PORTLIST NL
+ "or-address" SP ADDRESS ":" PORT NL
[Any number]
ADDRESS = IP6ADDR | IP4ADDR
IPV6ADDR = an ipv6 address, surrounded by square brackets.
IPV4ADDR = an ipv4 address, represented as a dotted quad.
- PORTLIST = PORTSPEC | PORTSPEC "," PORTLIST
- PORTSPEC = PORT
PORT = a number between 1 and 65535 inclusive.
An alternative for the address and ORPort of the "router" line, but with
@@ -1125,7 +1123,7 @@
(Only included when generating microdescriptors for
consensus-method 16 or later.)
- "a" SP address ":" portlist NL
+ "a" SP address ":" port NL
[Any number]
@@ -1470,7 +1468,7 @@
ORPort is its current OR port, "DirPort" is its current directory
port, or "0" for "none".
- "a" SP address ":" portlist NL
+ "a" SP address ":" port NL
[Any number.]
diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 112ea4b..f1fed25 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -106,7 +106,7 @@ Proposals by number:
183 Refill Intervals [CLOSED]
184 Miscellaneous changes for a v3 Tor link protocol [CLOSED]
185 Directory caches without DirPort [OPEN]
-186 Multiple addresses for one OR or bridge [ACCEPTED]
+186 Multiple addresses for one OR or bridge [CLOSED]
187 Reserve a cell type to allow client authorization [CLOSED]
188 Bridge Guards and other anti-enumeration defenses [OPEN]
189 AUTHORIZE and AUTHORIZED cells [OPEN]
@@ -192,7 +192,6 @@ Proposals by status:
157 Make certificate downloads specific [for 0.2.4.x]
172 GETINFO controller option for circuit information
173 GETINFO Option Expansion
- 186 Multiple addresses for one OR or bridge [for 0.2.4.x+]
META:
000 Index of Tor Proposals
001 The Tor Proposal Process
@@ -248,6 +247,7 @@ Proposals by status:
181 Optimistic Data for Tor: Client Side [in 0.2.3.3-alpha]
183 Refill Intervals [in 0.2.3.5-alpha]
184 Miscellaneous changes for a v3 Tor link protocol [for 0.2.3.x]
+ 186 Multiple addresses for one OR or bridge [for 0.2.4.x+]
187 Reserve a cell type to allow client authorization [for 0.2.3.x]
193 Safe cookie authentication for Tor controllers
200 Adding new, extensible CREATE, EXTEND, and related cells [in 0.2.4.8-alpha]
diff --git a/proposals/186-multiple-orports.txt b/proposals/186-multiple-orports.txt
index 9a186e0..f66ad83 100644
--- a/proposals/186-multiple-orports.txt
+++ b/proposals/186-multiple-orports.txt
@@ -3,7 +3,7 @@ Title: Multiple addresses for one OR or bridge
Author: Nick Mathewson
Created: 19-Sep-2011
Supersedes: 118
-Status: Accepted
+Status: Closed
Target: 0.2.4.x+
Status: