July 2020 - tor-commits - lists.torproject.org

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 27 Jul '20

27 Jul '20

commit e6a602e25a16404ac0f69366f05f759f725d57a8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 15:15:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- nl.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nl.po b/nl.po index 404779709c..e2e2c3ae7f 100644 --- a/nl.po +++ b/nl.po @@ -37,7 +37,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-27 05:58+0200\n" -"PO-Revision-Date: 2020-07-27 14:45+0000\n" +"PO-Revision-Date: 2020-07-27 14:46+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -1422,14 +1422,14 @@ msgstr "Bestandscontainer kiezen" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Launch the Unsafe Browser?" -msgstr "" +msgstr "De Onveilige Browser starten?" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "The Unsafe Browser is not anonymous and the websites that you visit can see " "your real IP address.\\n\\nOnly use the Unsafe Browser to log in to a " "captive portal or browse trusted web pages on the local network." -msgstr "" +msgstr "De Onveilige Browser is niet anoniem, en de websites die u bezoekt kunnen uw echte IP-adres zien.\\n\\nGebruik de Onveilige Browser alleen voor aanmelding bij een aanmeldingspagina ('captive portal') of om vertrouwde webpagina's op het lokale netwerk te bekijken." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 msgid "Starting the Unsafe Browser..." @@ -1463,7 +1463,7 @@ msgstr "Onveilige Browser" msgid "" "The Unsafe Browser was not enabled in the Welcome Screen.\\n\\nTo use the Unsafe Browser, restart Tails and enable the Unsafe Browser in the additional settings of the Welcome Screen.\\n\n" "To always enable the Unsafe Browser, turn on the Welcome Screen feature of the Persistent Storage." -msgstr "" +msgstr "De Onveilige Browser is niet ingeschakeld in het Welkomstscherm.\\n\\nOm de Onveilige Browser te gebruiken, herstart u Tails en schakelt u de Onveilige Browser in in de extra instellingen van het Welkomstscherm.\\n\nOm de Onveilige Browser altijd in te schakelen, zet u de functie Welkomstscherm van de Permanente opslag aan." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:99 msgid ""

1 0

[tpo/master] Merge branch 'master' into 'master'
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 992048474405c20504f8528bdd93bdb39568caae Merge: 45325bd0 647c3f8d Author: Antonela <antonela(a)torproject.org> Date: Mon Jul 27 13:51:28 2020 +0000 Merge branch 'master' into 'master' Rebase master See merge request antonela/tpo!2 assets/static/images/membership/green.png | Bin 0 -> 239288 bytes assets/static/images/membership/header.png | Bin 0 -> 334841 bytes assets/static/images/membership/logos/Avast.png | Bin 0 -> 78009 bytes .../static/images/membership/logos/MullvadVPN.svg | 197 +++++++++++++++++++++ assets/static/images/membership/shallot.png | Bin 0 -> 208458 bytes assets/static/images/membership/vidalia.png | Bin 0 -> 169283 bytes .../static/images/sponsors/Bertha_Foundation.jpg | Bin 0 -> 451667 bytes content/about/membership/contents.lr | 13 ++ content/about/sponsors/Bertha/contents.lr | 19 ++ templates/membership.html | 138 +++++++++++++++ 10 files changed, 367 insertions(+)

1 0

[tpo/master] Update members
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit cfd88badb0f3f7784870c558bb923741d5c35e23 Author: antonela <antonela(a)torproject.org> Date: Mon Jul 27 11:02:57 2020 -0300 Update members --- assets/static/images/membership/logos/MullvadVPN.png | Bin 0 -> 21976 bytes templates/membership.html | 11 +++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/assets/static/images/membership/logos/MullvadVPN.png b/assets/static/images/membership/logos/MullvadVPN.png new file mode 100644 index 00000000..2758df73 Binary files /dev/null and b/assets/static/images/membership/logos/MullvadVPN.png differ diff --git a/templates/membership.html b/templates/membership.html index 171b5285..6d915086 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -42,7 +42,7 @@ <div class="container"> <div class="row p-5 my-5 border text-center"> <p> - Community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. + Your commitment to the community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. </p> </div> </div> @@ -51,10 +51,9 @@ <h3 class="col-12 text-primary display-4">Shallot Onion Members</h3> <div class="col-md-4 col-xl-4 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top" src="{{ '../../static/images/membership/logos/MullvadVPN.svg' }}" alt="MullvadVPN"> + <img class="card-img-top" src="#" alt=""> <div class="card-body"> - <p><a href="#" class="h4">Mullvad VPN</a></p> - Mullvad is a VPN service that helps users keep their online activity, identity, and location private. With a fundamental belief in privacy as a universal right, Mullvad's ultimate goal is to make Internet censorship and mass surveillance ineffective. + <p><a href="#" class="h4"></a></p> </div> </div> </div> @@ -81,12 +80,12 @@ <h3 class="col-12 text-primary display-4">Vidalia Onion Members</h3> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/Avast.png' }}" alt="Avast"> + <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/avast.png' }}" alt="Avast"> </div> </div> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt=""> + <img class="card-img-top p-3" src="{{ '../../static/images/membership/logos/MullvadVPN.png' }}" alt="MullvadVPN"> </div> </div> <div class="col-md-3 col-xl-3 my-2">

1 0

[torspec/master] Write a README.md for torspec.
by nickm＠torproject.org 27 Jul '20

27 Jul '20

commit 77ecc21b1265697a33617bc4c64f6748454913d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 27 09:38:54 2020 -0400 Write a README.md for torspec. --- README.md | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/README.md b/README.md new file mode 100644 index 0000000..1a02a37 --- /dev/null +++ b/README.md @@ -0,0 +1,69 @@ +# Tor specifications + +This repository holds the specifications that describe how Tor works. +They try to present Tor's protocols in sufficient detail to allow +the reader to implement a compatible implementation of Tor without ever +having to read the Tor source code. + +The [proposals](/proposals) directory holds our design proposals. These +include historical documents that have now been merged into . For more +information on the proposal process, including an explanation of how to +make new proposals, see, see +[001-process.txt](/proposals/001-process.txt). + +## What you can find here + +Tor's specification is pretty big, and we've broken it into a bunch of +files. + +* General interest + * [tor-spec.txt](tor-spec.txt) + contains the specification for the core Tor protocol + itself; this is a good place to start reading. + * [cert-spec.txt](cert-spec.txt) describes a certificate format used + in the other parts of the protocol. + * [dir-spec.txt](dir-spec.txt) specifies the operations and formats used to + maintain a view of the network directory. + * [padding-spec.txt](padding-spec.txt) describes a set of padding mechanisms + used to impede traffic analysis. + * [version-spec.txt](version-spec.txt) explains how to parse Tor + version numbers. + * [glossary.txt](glossary.txt) is a glossary of terms used + in the other specifications. +* Client operations + * [address-spec.txt](address-spec.txt) lists a set of special + addresses that Tor handles differently from the regular DNS system. + * [guard-spec.txt](guard-spec.txt) explains the "guard node" algorithm + that Tor clients use to avoid sampling attacks. + * [path-spec.txt](path-spec.txt) explains how clients choose their paths + through the Tor network. + * [socks-extensions](socks-extensions.txt) specifies Tor-specific + extensions to the SOCKS protocol. +* Onion services + * [rend-spec-v2.txt](rend-spec-v2.txt) is the old, deprecated version + of the onion service protocol. + * [rend-spec-v3.txt](rend-spec-v3.txt) is the current version of the + onion service protocol. +* Censorship resistance + * [bridgedb-spec.txt](bridgedb-spec.txt) explains how the `bridgedb` + server gives out bridges to censored clients. + * [gettor-spec.txt](gettor-spec.txt) describes the `gettor` tool, + which is used to download Tor in censored areas. + * [pt-spec.txt](pt-spec.txt) describes the protocol that Tor clients + and relays use to communicate with pluggable transports used for + traffic obfuscation. +* Directory authorities + * [bandwidth-file-spec.txt](bandwidth-file-spec.txt) specifies the + file format used by bandwidth-measuring tools to report their + observations to directory authorities. + * [srv-spec.txt](src-spec.txt) specifies the protocol that + directory authorities use to securely compute shared random values + for the network. +* Controller protocol + * [control-spec.txt](control-spec.txt) explains the protocol used by + controllers to communicate with a running Tor process. +* Miscellaneous + * [dir-list-spec.txt](dir-list-spec.txt) explains the format used by + tools like the fallback directory scripts to output a list of + Tor directories for inclusion in the Tor source code. + * The [attic](attic) directory has obsolete or historical documents.

1 0

[torspec/master] Add a pair of templates for markdown proposal indices
by nickm＠torproject.org 27 Jul '20

27 Jul '20

commit 3395172250079bd0c9f20936037b3f9c2c23cc4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 27 10:14:24 2020 -0400 Add a pair of templates for markdown proposal indices --- proposals/INDEX_template.md | 10 +++++ proposals/README_template.md | 99 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/proposals/INDEX_template.md b/proposals/INDEX_template.md new file mode 100644 index 0000000..48c457c --- /dev/null +++ b/proposals/INDEX_template.md @@ -0,0 +1,10 @@ +# Tor proposals by number + +Here we have a set of proposals for changes to the Tor protocol. Some +of these proposals are implemented; some are works in progress; and some +will never be implemented. + +Below are a list of proposals sorted by status. See +[README.md](/proposals/README.md) for a list of proposals sorted by number. + +{BY_INDEX} diff --git a/proposals/README_template.md b/proposals/README_template.md new file mode 100644 index 0000000..b8fa7e2 --- /dev/null +++ b/proposals/README_template.md @@ -0,0 +1,99 @@ +# Tor proposals by status + +Here we have a set of proposals for changes to the Tor protocol. Some +of these proposals are implemented; some are works in progress; and some +will never be implemented. + +Below are a list of proposals sorted by status. See +[INDEX.md](/proposals/INDEX.md) for a list of proposals sorted by number. + +# Active proposals by status + +## OPEN proposals: Under discussion + +These are proposals that we think are likely to be complete, and ripe +for discussion. + +{OPEN} + +## ACCEPTED proposals: Slated for implementation + +These are the proposals that we agree we'd like to implement. They +might or might not have a specific timeframe planned for their +implementation. + +{ACCEPTED} + +## FINISHED proposals: Implemented, specs not merged + +These proposals are implemented in some version of Tor; the proposals +themselves still need to be merged into the specifications proper. + +{FINISHED} + +## META proposals: About the proposal process + +These proposals describe ongoing policies and changes to the proposals +process. + +{META} + +## INFORMATIONAL proposals: not actually specifications + +These proposals describe a process or project, but aren't actually +proposed changes in the Tor specifications. + +{INFORMATIONAL} + +# Preliminary proposals + +## DRAFT proposals: incomplete works + +{DRAFT} + +## NEEDS-REVISION proposals: good ideas that we can't implement as-is. + +{NEEDS-REVISION} + +## NEEDS-RESEARCH proposals: blocking on research + +{NEEDS-RESEARCH} + +# Inactive proposals by status + +## CLOSED proposals: Implemented and specified + +These proposals have been implemented in some version of Tor, and the +changes from the proposals have been merged into the specifications as +necessary. + +{CLOSED} + +## RESERVE proposals: Saving for later + +These proposals aren't anything we plan to implement soon, but for one +reason or another we think they might be a good idea in the +future. We're keeping them around as a reference in case we someday +confront the problems that they try to solve. + +{RESERVE} + +## SUPERSEDED proposals: Replaced by something else + +These proposals were obsoleted by a later proposal before they were +implemented. + +{SUPERSEDED} + +## DEAD, REJECTED, OBSOLETE proposals: Not in our plans. + +These proposals are not on-track for discussion or +implementation. Either discussion has stalled out (the proposal is +DEAD), the proposal has been considered and not adopted (the proposal is +REJECTED), or the proposal addresses an issue or a solution that is no +longer relevant (the proposal is OBSOLETE). + +{DEAD_REJECTED_OBSOLETE} + + +

1 0

[torspec/master] reindex.py: drop python2 support.
by nickm＠torproject.org 27 Jul '20

27 Jul '20

commit ea85e63de494d5ad18b587ded43f6fa437d4873c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 27 10:18:21 2020 -0400 reindex.py: drop python2 support. --- proposals/reindex.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/proposals/reindex.py b/proposals/reindex.py index 361ea16..07dd17a 100755 --- a/proposals/reindex.py +++ b/proposals/reindex.py @@ -1,9 +1,9 @@ #!/usr/bin/env python -# Future imports for Python 2.7, mandatory in 3.0 -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals +import sys +if sys.version_info[0] < 3: + print("No support for Python 2.") + sys.exit(1) import codecs, re, os class Error(Exception): pass

1 0

[torspec/master] Move tor-fw-helper-spec.txt to attic. This feature is no longer supported.
by nickm＠torproject.org 27 Jul '20

27 Jul '20

commit a872fc67b425470d0b0a09790dd6a376e4b0515a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 27 09:56:29 2020 -0400 Move tor-fw-helper-spec.txt to attic. This feature is no longer supported. --- tor-fw-helper-spec.txt => attic/tor-fw-helper-spec.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tor-fw-helper-spec.txt b/attic/tor-fw-helper-spec.txt similarity index 100% rename from tor-fw-helper-spec.txt rename to attic/tor-fw-helper-spec.txt

1 0

[torspec/master] Update reindex script to generate nice markdown.
by nickm＠torproject.org 27 Jul '20

27 Jul '20

commit 1fa2a98dac5b19a8139a4b1345731c000061e69d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 27 10:38:37 2020 -0400 Update reindex script to generate nice markdown. --- proposals/reindex.py | 77 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 11 deletions(-) diff --git a/proposals/reindex.py b/proposals/reindex.py index 07dd17a..eb4da0f 100755 --- a/proposals/reindex.py +++ b/proposals/reindex.py @@ -17,8 +17,16 @@ CONDITIONAL_FIELDS = { "OPEN" : [ "Target", "Ticket" ], "FINISHED" : [ "Implemented-In", "Ticket" ] } FNAME_RE = re.compile(r'^(\d\d\d)-.*[^\~]$') DIR = "." -OUTFILE = "000-index.txt" -TMPFILE = OUTFILE+".tmp" +OUTFILE_TXT = "000-index.txt" +TMPFILE_TXT = OUTFILE_TXT+".tmp" + +TEMPFILES = [TMPFILE_TXT] + +def unlink_if_present(fname): + try: + os.unlink(fname) + except OSError: + pass def indexed(seq): n = 0 @@ -95,6 +103,8 @@ def readProposals(): for fn in os.listdir(DIR): m = FNAME_RE.match(fn) if not m: continue + if fn.endswith(".tmp"): + continue if not (fn.endswith(".txt") or fn.endswith(".md")): raise Error("%s doesn't end with .txt or .md"%fn) num = m.group(1) @@ -104,14 +114,14 @@ def readProposals(): res.append(fields) return res -def writeIndexFile(proposals): +def writeTextIndexFile(proposals): proposals.sort(key=lambda f:f['num']) seenStatuses = set() for p in proposals: seenStatuses.add(p['Status']) - out = open(TMPFILE, 'w') - inf = open(OUTFILE, 'r') + out = open(TMPFILE_TXT, 'w') + inf = open(OUTFILE_TXT, 'r') for line in inf: out.write(line) if line.startswith("====="): break @@ -133,11 +143,56 @@ def writeIndexFile(proposals): out.write(" [in %(Implemented-In)s]"%prop) out.write("\n") out.close() - os.rename(TMPFILE, OUTFILE) + os.rename(TMPFILE_TXT, OUTFILE_TXT) + +def formatMarkdownEntry(prop, withStatus=False): + if withStatus: + fmt = "* [`{Filename}`](/proposals/{Filename}): {Title} [{Status}]\n" + else: + fmt = "* [`{Filename}`](/proposals/{Filename}): {Title}\n" + return fmt.format(**prop) + +def writeMarkdownFile(prefix, format_inputs): + template = prefix+"_template.md" + output = prefix+".md" + t = open(template).read() + content = t.format(**format_inputs) + with open(output, 'w') as f: + f.write(content) + +def writeMarkdownIndexFiles(proposals): + markdown_files = [ "README", "INDEX" ] + format_inputs = {} + + entries = [] + for prop in proposals: + entries.append(formatMarkdownEntry(prop, withStatus=True)) + format_inputs["BY_INDEX"] = "".join(entries) + + for s in STATUSES: + entries = [] + for prop in proposals: + if s == prop['Status']: + entries.append(formatMarkdownEntry(prop)) + if entries: + format_inputs[s] = "".join(entries) + else: + format_inputs[s] = "(There are no proposals in this category)\n" + + entries = [] + for prop in proposals: + if prop['Status'] in ('DEAD', 'REJECTED', 'OBSOLETE'): + entries.append(formatMarkdownEntry(prop, withStatus=True)) + format_inputs['DEAD_REJECTED_OBSOLETE'] = "".join(entries) -try: - os.unlink(TMPFILE) -except OSError: - pass + for prefix in markdown_files: + writeMarkdownFile(prefix, format_inputs) -writeIndexFile(readProposals()) +if __name__ == '__main__': + proposals = readProposals() + try: + writeTextIndexFile(proposals) + writeMarkdownIndexFiles(proposals) + finally: + for tempfile in TEMPFILES: + unlink_if_present(tempfile)

1 0

[torspec/master] Change index file name so it doesn't override readme.
by nickm＠torproject.org 27 Jul '20

27 Jul '20

commit 4c7124a311d6b7930d527a4379f09873b93993ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 27 10:43:34 2020 -0400 Change index file name so it doesn't override readme. --- proposals/{INDEX.md => BY_INDEX.md} | 0 proposals/{INDEX_template.md => BY_INDEX_template.md} | 0 proposals/reindex.py | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/INDEX.md b/proposals/BY_INDEX.md similarity index 100% rename from proposals/INDEX.md rename to proposals/BY_INDEX.md diff --git a/proposals/INDEX_template.md b/proposals/BY_INDEX_template.md similarity index 100% rename from proposals/INDEX_template.md rename to proposals/BY_INDEX_template.md diff --git a/proposals/reindex.py b/proposals/reindex.py index eb4da0f..6ac1bbb 100755 --- a/proposals/reindex.py +++ b/proposals/reindex.py @@ -161,7 +161,7 @@ def writeMarkdownFile(prefix, format_inputs): f.write(content) def writeMarkdownIndexFiles(proposals): - markdown_files = [ "README", "INDEX" ] + markdown_files = [ "README", "BY_INDEX" ] format_inputs = {} entries = []

1 0

[torspec/master] Small template and script improvements
by nickm＠torproject.org 27 Jul '20

27 Jul '20

commit 246a5864619e2393d447aab5826a990fdef3dfd5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 27 10:49:51 2020 -0400 Small template and script improvements --- proposals/BY_INDEX.md | 10 ++++++++-- proposals/BY_INDEX_template.md | 10 ++++++++-- proposals/README.md | 35 ++++++++++++++++++++++++++--------- proposals/README_template.md | 35 ++++++++++++++++++++++++++--------- proposals/reindex.py | 2 ++ 5 files changed, 70 insertions(+), 22 deletions(-) diff --git a/proposals/BY_INDEX.md b/proposals/BY_INDEX.md index d0e3b2b..5a66ae2 100644 --- a/proposals/BY_INDEX.md +++ b/proposals/BY_INDEX.md @@ -1,11 +1,17 @@ # Tor proposals by number + + + + + + Here we have a set of proposals for changes to the Tor protocol. Some of these proposals are implemented; some are works in progress; and some will never be implemented. -Below are a list of proposals sorted by status. See -[README.md](/proposals/README.md) for a list of proposals sorted by number. +Below are a list of proposals sorted by their proposal number. See +[README.md](/proposals/README.md) for a list of proposals sorted by status. * [`000-index.txt`](/proposals/000-index.txt): Index of Tor Proposals [META] * [`001-process.txt`](/proposals/001-process.txt): The Tor Proposal Process [META] diff --git a/proposals/BY_INDEX_template.md b/proposals/BY_INDEX_template.md index 48c457c..d18dc60 100644 --- a/proposals/BY_INDEX_template.md +++ b/proposals/BY_INDEX_template.md @@ -1,10 +1,16 @@ # Tor proposals by number +{warning} + + + + + Here we have a set of proposals for changes to the Tor protocol. Some of these proposals are implemented; some are works in progress; and some will never be implemented. -Below are a list of proposals sorted by status. See -[README.md](/proposals/README.md) for a list of proposals sorted by number. +Below are a list of proposals sorted by their proposal number. See +[README.md](/proposals/README.md) for a list of proposals sorted by status. {BY_INDEX} diff --git a/proposals/README.md b/proposals/README.md index 9574070..79abf0c 100644 --- a/proposals/README.md +++ b/proposals/README.md @@ -1,5 +1,11 @@ # Tor proposals by status + + + + + + Here we have a set of proposals for changes to the Tor protocol. Some of these proposals are implemented; some are works in progress; and some will never be implemented. @@ -9,7 +15,7 @@ Below are a list of proposals sorted by status. See # Active proposals by status -## OPEN proposals: Under discussion +## OPEN proposals: under discussion These are proposals that we think are likely to be complete, and ripe for discussion. @@ -38,7 +44,7 @@ for discussion. * [`324-rtt-congestion-control.txt`](/proposals/324-rtt-congestion-control.txt): RTT-based Congestion Control for Tor -## ACCEPTED proposals: Slated for implementation +## ACCEPTED proposals: slated for implementation These are the proposals that we agree we'd like to implement. They might or might not have a specific timeframe planned for their @@ -54,7 +60,7 @@ implementation. * [`314-allow-markdown-proposals.md`](/proposals/314-allow-markdown-proposals.md): Allow Markdown for proposal format -## FINISHED proposals: Implemented, specs not merged +## FINISHED proposals: implemented, specs not merged These proposals are implemented in some version of Tor; the proposals themselves still need to be merged into the specifications proper. @@ -66,7 +72,7 @@ themselves still need to be merged into the specifications proper. * [`260-rend-single-onion.txt`](/proposals/260-rend-single-onion.txt): Rendezvous Single Onion Services -## META proposals: About the proposal process +## META proposals: about the proposal process These proposals describe ongoing policies and changes to the proposals process. @@ -92,6 +98,10 @@ proposed changes in the Tor specifications. ## DRAFT proposals: incomplete works +These proposals have been marked as a draft by their author or the editors, +indicating that they aren't yet in a complete form. They're still open for +discussion. + * [`240-auth-cert-revocation.txt`](/proposals/240-auth-cert-revocation.txt): Early signing key revocation for directory authorities * [`273-exit-relay-pinning.txt`](/proposals/273-exit-relay-pinning.txt): Exit relay pinning for web services * [`294-tls-1.3.txt`](/proposals/294-tls-1.3.txt): TLS 1.3 Migration @@ -108,7 +118,10 @@ proposed changes in the Tor specifications. * [`325-packed-relay-cells.md`](/proposals/325-packed-relay-cells.md): Packed relay cells: saving space on small commands -## NEEDS-REVISION proposals: good ideas that we can't implement as-is. +## NEEDS-REVISION proposals: ideas that we can't implement as-is + +These proposals have some promise, but we can't implement them without +certain changes. * [`212-using-old-consensus.txt`](/proposals/212-using-old-consensus.txt): Increase Acceptable Consensus Age * [`219-expanded-dns.txt`](/proposals/219-expanded-dns.txt): Support for full DNS and DNSSEC resolution in Tor @@ -122,12 +135,16 @@ proposed changes in the Tor specifications. ## NEEDS-RESEARCH proposals: blocking on research +These proposals are interesting ideas, but there's more research that would +need to happen before we can know whether to implement them or not, or to +fill in certain details. + (There are no proposals in this category) # Inactive proposals by status -## CLOSED proposals: Implemented and specified +## CLOSED proposals: implemented and specified These proposals have been implemented in some version of Tor, and the changes from the proposals have been merged into the specifications as @@ -224,7 +241,7 @@ necessary. * [`305-establish-intro-dos-defense-extention.txt`](/proposals/305-establish-intro-dos-defense-extention.txt): ESTABLISH_INTRO Cell DoS Defense Extension -## RESERVE proposals: Saving for later +## RESERVE proposals: saving for later These proposals aren't anything we plan to implement soon, but for one reason or another we think they might be a good idea in the @@ -243,7 +260,7 @@ confront the problems that they try to solve. * [`281-bulk-md-download.txt`](/proposals/281-bulk-md-download.txt): Downloading microdescriptors in bulk -## SUPERSEDED proposals: Replaced by something else +## SUPERSEDED proposals: replaced by something else These proposals were obsoleted by a later proposal before they were implemented. @@ -272,7 +289,7 @@ implemented. * [`280-privcount-in-tor.txt`](/proposals/280-privcount-in-tor.txt): Privacy-Preserving Statistics with Privcount in Tor -## DEAD, REJECTED, OBSOLETE proposals: Not in our plans. +## DEAD, REJECTED, OBSOLETE proposals: not in our plans These proposals are not on-track for discussion or implementation. Either discussion has stalled out (the proposal is diff --git a/proposals/README_template.md b/proposals/README_template.md index b8fa7e2..55a913d 100644 --- a/proposals/README_template.md +++ b/proposals/README_template.md @@ -1,5 +1,11 @@ # Tor proposals by status +{warning} + + + + + Here we have a set of proposals for changes to the Tor protocol. Some of these proposals are implemented; some are works in progress; and some will never be implemented. @@ -9,14 +15,14 @@ Below are a list of proposals sorted by status. See # Active proposals by status -## OPEN proposals: Under discussion +## OPEN proposals: under discussion These are proposals that we think are likely to be complete, and ripe for discussion. {OPEN} -## ACCEPTED proposals: Slated for implementation +## ACCEPTED proposals: slated for implementation These are the proposals that we agree we'd like to implement. They might or might not have a specific timeframe planned for their @@ -24,14 +30,14 @@ implementation. {ACCEPTED} -## FINISHED proposals: Implemented, specs not merged +## FINISHED proposals: implemented, specs not merged These proposals are implemented in some version of Tor; the proposals themselves still need to be merged into the specifications proper. {FINISHED} -## META proposals: About the proposal process +## META proposals: about the proposal process These proposals describe ongoing policies and changes to the proposals process. @@ -49,19 +55,30 @@ proposed changes in the Tor specifications. ## DRAFT proposals: incomplete works +These proposals have been marked as a draft by their author or the editors, +indicating that they aren't yet in a complete form. They're still open for +discussion. + {DRAFT} -## NEEDS-REVISION proposals: good ideas that we can't implement as-is. +## NEEDS-REVISION proposals: ideas that we can't implement as-is + +These proposals have some promise, but we can't implement them without +certain changes. {NEEDS-REVISION} ## NEEDS-RESEARCH proposals: blocking on research +These proposals are interesting ideas, but there's more research that would +need to happen before we can know whether to implement them or not, or to +fill in certain details. + {NEEDS-RESEARCH} # Inactive proposals by status -## CLOSED proposals: Implemented and specified +## CLOSED proposals: implemented and specified These proposals have been implemented in some version of Tor, and the changes from the proposals have been merged into the specifications as @@ -69,7 +86,7 @@ necessary. {CLOSED} -## RESERVE proposals: Saving for later +## RESERVE proposals: saving for later These proposals aren't anything we plan to implement soon, but for one reason or another we think they might be a good idea in the @@ -78,14 +95,14 @@ confront the problems that they try to solve. {RESERVE} -## SUPERSEDED proposals: Replaced by something else +## SUPERSEDED proposals: replaced by something else These proposals were obsoleted by a later proposal before they were implemented. {SUPERSEDED} -## DEAD, REJECTED, OBSOLETE proposals: Not in our plans. +## DEAD, REJECTED, OBSOLETE proposals: not in our plans These proposals are not on-track for discussion or implementation. Either discussion has stalled out (the proposal is diff --git a/proposals/reindex.py b/proposals/reindex.py index 6ac1bbb..72b1234 100755 --- a/proposals/reindex.py +++ b/proposals/reindex.py @@ -164,6 +164,8 @@ def writeMarkdownIndexFiles(proposals): markdown_files = [ "README", "BY_INDEX" ] format_inputs = {} + format_inputs['warning'] = "" + entries = [] for prop in proposals: entries.append(formatMarkdownEntry(prop, withStatus=True))

1 0