aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-11-23 23:40:21 +0000
committerRoger Dingledine <arma@torproject.org>2007-11-23 23:40:21 +0000
commit5b3cc6cd7e5fa083b32ab9a286f9eec05b831801 (patch)
tree08a0a19dd15cdc23c08d5194382629608a72cfeb /doc
parent402f46a0ddd6a9ddba1b1e57d5afd52f9f90ef15 (diff)
downloadtor-5b3cc6cd7e5fa083b32ab9a286f9eec05b831801.tar
tor-5b3cc6cd7e5fa083b32ab9a286f9eec05b831801.tar.gz
move the bridges proposal into a real proposal number.
svn:r12562
Diffstat (limited to 'doc')
-rw-r--r--doc/spec/proposals/000-index.txt2
-rw-r--r--doc/spec/proposals/125-bridges.txt (renamed from doc/spec/proposals/xxx-bridges.txt)0
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/spec/proposals/000-index.txt b/doc/spec/proposals/000-index.txt
index 711fdf37c..811de30f3 100644
--- a/doc/spec/proposals/000-index.txt
+++ b/doc/spec/proposals/000-index.txt
@@ -47,6 +47,7 @@ Proposals by number:
122 Network status entries need a new Unnamed flag [CLOSED]
123 Naming authorities automatically create bindings [OPEN]
124 Blocking resistant TLS certificate usage [ACCEPTED]
+125 Behavior for bridge users, bridge relays, and bridge authorities [OPEN]
Proposals by status:
@@ -61,6 +62,7 @@ Proposals by status:
120 Suicide descriptors when Tor servers stop
121 Hidden Service Authentication
123 Naming authorities automatically create bindings
+ 125 Behavior for bridge users, bridge relays, and bridge authorities
ACCEPTED:
105 Version negotiation for the Tor protocol
124 Blocking resistant TLS certificate usage
diff --git a/doc/spec/proposals/xxx-bridges.txt b/doc/spec/proposals/125-bridges.txt
index 3b96ecd9d..3b96ecd9d 100644
--- a/doc/spec/proposals/xxx-bridges.txt
+++ b/doc/spec/proposals/125-bridges.txt