update and integrate proposals 125 (bridges) and 137 (bootstrap status)
commit449174d796930b7bcb4269c012d9251ca2140ad8
authorRoger Dingledine <arma@torproject.org>
Sun, 3 Aug 2008 15:34:28 +0000 (3 15:34 +0000)
committerRoger Dingledine <arma@torproject.org>
Sun, 3 Aug 2008 15:34:28 +0000 (3 15:34 +0000)
tree734a3faf774853e1f12c53e4f693828adc668f36
parent44536fddbc34c10a570f2799dc707e7511c432ad
update and integrate proposals 125 (bridges) and 137 (bootstrap status)

svn:r16374
doc/spec/address-spec.txt
doc/spec/bridges-spec.txt [copied from doc/spec/proposals/125-bridges.txt with 63% similarity]
doc/spec/control-spec.txt
doc/spec/proposals/000-index.txt
doc/spec/proposals/125-bridges.txt
doc/spec/proposals/137-bootstrap-phases.txt
doc/spec/proposals/ideas/xxx-bridge-disbursement.txt