tor-commits February 2015

tor-commits@lists.torproject.org

15 participants
2121 discussions

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 25 Feb '15

25 Feb '15

commit ea43f42c291823aa0c4a89e94e2446490fe73531 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 25 15:15:36 2015 +0000 Update translations for tails-misc --- sq.po | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/sq.po b/sq.po index 9ed4ee0..ef73e86 100644 --- a/sq.po +++ b/sq.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 14:45+0000\n" +"PO-Revision-Date: 2015-02-25 15:13+0000\n" "Last-Translator: Bujar Tafili\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n" "MIME-Version: 1.0\n" @@ -270,11 +270,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." -msgstr "" +msgstr "Përmirësimi ishte i suksesshëm." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" -msgstr "" +msgstr "Sinkronizimi i orës së sistemit" #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 msgid "" @@ -284,11 +284,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" -msgstr "" +msgstr "Dështim në sinkronizimin e orës së sistemit!" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 msgid "Network connection blocked?" -msgstr "" +msgstr "Po pengohet lidhja me rrjetin?" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 msgid "" @@ -305,7 +305,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "Karta e rrjetit ${nic} është paaftësuar" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 #, sh-format @@ -328,7 +328,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 msgid "error:" -msgstr "" +msgstr "gabim:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 @@ -350,20 +350,20 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" -msgstr "" +msgstr "Kujdes: është zbuluar makinë virtuale!" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." -msgstr "" +msgstr "Si sistemi operativ pritës, ashtu edhe programi virtualizues janë në gjendje të monitorojnë se çfarë po bëni në Tails." #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 msgid "" "<a " "href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" " more...</a>" -msgstr "" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Mësoni më shumë...</a>" #: config/chroot_local-includes/usr/local/bin/tor-browser:18 msgid "Tor is not ready" @@ -383,26 +383,26 @@ msgstr "Anuloni" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "" +msgstr "Vërtet dëshironi të lëshoni Shfletuesin e Pasigurt?" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." -msgstr "" +msgstr "Veprimtaria e rrjetit brenda Shfletuesit të Pasigurt <b>s'është anonime</b>. Përdoreni Shfletuesin e Pasigurt vetëm nëse është e domosdoshme, për shembull nëse ju duhet të hyni apo të regjistroheni për të aktivizuar lidhjen tuaj Internet." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 msgid "Starting the Unsafe Browser..." -msgstr "" +msgstr "Duke nisur Shfletuesin e Pasigurt..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 msgid "This may take a while, so please be patient." -msgstr "" +msgstr "Kjo do të marrë pak kohë, ndaj ju lutemi jini i durueshëm." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "Shutting down the Unsafe Browser..." -msgstr "" +msgstr "Duke mbyllur Shfletuesin e Pasigurt..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 msgid "" @@ -439,37 +439,37 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:123 msgid "Failed to setup chroot." -msgstr "" +msgstr "Dështim në konfigurimin e chroot." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129 msgid "Failed to configure browser." -msgstr "" +msgstr "Dështim në konfigurimin e shfletuesit." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134 msgid "Failed to run browser." -msgstr "" +msgstr "Dështim në ekzekutimin e shfletuesit." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 msgid "I2P failed to start" -msgstr "" +msgstr "I2P dështoi të niset" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:32 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." -msgstr "" +msgstr "Diçka shkoi keq kur po nisej I2P. Për më shumë informacion kontrolloni regjistrat në /var/log/i2p." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 msgid "I2P's router console is ready" -msgstr "" +msgstr "Paneli i ruterit I2P's është gati" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "" +msgstr "Ju tani mund të qaseni në panelin e ruterit I2P's tek http://127.0.0.1:7657." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" -msgstr "" +msgstr "I2P s'është gati" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" @@ -480,28 +480,28 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready" -msgstr "" +msgstr "I2P është gati" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:61 msgid "You can now access services on I2P." -msgstr "" +msgstr "Ju tani mund t'u qaseni shërbimeve në I2P." #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" -msgstr "" +msgstr "Raportoni një gabim" #: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1 #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1 msgid "Tails documentation" -msgstr "" +msgstr "Dokumentacioni i Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 msgid "Learn how to use Tails" -msgstr "" +msgstr "Mësoni sesi ta përdorni Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 msgid "Anonymous overlay network browser" -msgstr "" +msgstr "Mbivendosje anonime e shfletuesit të rrjetit " #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 25 Feb '15

25 Feb '15

commit 5520f99979e5c1ed32a4676a582c908e86d8dff1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 25 14:45:41 2015 +0000 Update translations for tails-misc_completed --- fr_CA.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 9189edb..2f57d7c 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-11 22:08+0100\n" -"PO-Revision-Date: 2015-02-13 13:01+0000\n" +"POT-Creation-Date: 2015-02-23 16:25+0100\n" +"PO-Revision-Date: 2015-02-25 14:41+0000\n" "Last-Translator: yahoe.001\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -59,7 +59,7 @@ msgid "" msgstr "Lorsque vous redémarrerez Tails, toutes les données d'Electrum seront perdues, incluant votre portefeuille Bitcoin. Il est fortement recommandé de n'utiliser Electrum qu'avec la fonction de persistance activée." #: config/chroot_local-includes/usr/local/bin/electrum:18 -msgid "Do you want to start Electrum any way?" +msgid "Do you want to start Electrum anyway?" msgstr "Voulez-vous quand même démarrer Electrum?" #: config/chroot_local-includes/usr/local/bin/electrum:20 @@ -365,9 +365,9 @@ msgstr "Le système d'exploitation hôte et le logiciel de virtualisation peuven #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 msgid "" "<a " -"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn" +"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" " more...</a>" -msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.fr.html'>En savoir plus...</a>" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>En apprendre davantage...</a>" #: config/chroot_local-includes/usr/local/bin/tor-browser:18 msgid "Tor is not ready"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 25 Feb '15

25 Feb '15

commit 7cba040378dad0aea5377b7038f9edf61e0cf448 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 25 14:45:37 2015 +0000 Update translations for tails-misc --- fr_CA.po | 8 ++++---- sq.po | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index aef2f49..2f57d7c 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-02-25 14:41+0000\n" +"Last-Translator: yahoe.001\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,7 +60,7 @@ msgstr "Lorsque vous redémarrerez Tails, toutes les données d'Electrum seront #: config/chroot_local-includes/usr/local/bin/electrum:18 msgid "Do you want to start Electrum anyway?" -msgstr "" +msgstr "Voulez-vous quand même démarrer Electrum?" #: config/chroot_local-includes/usr/local/bin/electrum:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 @@ -367,7 +367,7 @@ msgid "" "<a " "href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" " more...</a>" -msgstr "" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>En apprendre davantage...</a>" #: config/chroot_local-includes/usr/local/bin/tor-browser:18 msgid "Tor is not ready" diff --git a/sq.po b/sq.po index f5f1b83..9ed4ee0 100644 --- a/sq.po +++ b/sq.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 13:03+0000\n" +"PO-Revision-Date: 2015-02-25 14:45+0000\n" "Last-Translator: Bujar Tafili\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n" "MIME-Version: 1.0\n" @@ -82,15 +82,15 @@ msgstr "Rreth" #: config/chroot_local-includes/usr/local/bin/gpgApplet:192 msgid "Encrypt Clipboard with _Passphrase" -msgstr "Fshiheni Clipboard-in me _frazëkalim" +msgstr "Fshiheni Tabelën e Shënimeve me _frazëkalim" #: config/chroot_local-includes/usr/local/bin/gpgApplet:195 msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "Shenjojeni/Fshiheni Clipboard-in me _Çelësa Publikë" +msgstr "Nënshkruajeni/Fshiheni Tabelën e Shënimeve me _Çelësa Publikë" #: config/chroot_local-includes/usr/local/bin/gpgApplet:200 msgid "_Decrypt/Verify Clipboard" -msgstr "_Deshifroni/Verifikoni Clipboard-in" +msgstr "_Deshifroni/Verifikoni Tabelën e Shënimeve" #: config/chroot_local-includes/usr/local/bin/gpgApplet:204 msgid "_Manage Keys" @@ -98,25 +98,25 @@ msgstr "_Administroni Çelësat" #: config/chroot_local-includes/usr/local/bin/gpgApplet:244 msgid "The clipboard does not contain valid input data." -msgstr "" +msgstr "Tabelën e Shënimeve nuk përmban të dhëna hyrëse të vlefshme." #: config/chroot_local-includes/usr/local/bin/gpgApplet:295 #: config/chroot_local-includes/usr/local/bin/gpgApplet:297 #: config/chroot_local-includes/usr/local/bin/gpgApplet:299 msgid "Unknown Trust" -msgstr "" +msgstr "Besueshmëri e Panjohur" #: config/chroot_local-includes/usr/local/bin/gpgApplet:301 msgid "Marginal Trust" -msgstr "" +msgstr "Besueshmëri Anësore" #: config/chroot_local-includes/usr/local/bin/gpgApplet:303 msgid "Full Trust" -msgstr "" +msgstr "Besueshmëri e Plotë" #: config/chroot_local-includes/usr/local/bin/gpgApplet:305 msgid "Ultimate Trust" -msgstr "" +msgstr "Besueshmëri e Skajshme" #: config/chroot_local-includes/usr/local/bin/gpgApplet:358 msgid "Name" @@ -124,7 +124,7 @@ msgstr "Emri" #: config/chroot_local-includes/usr/local/bin/gpgApplet:359 msgid "Key ID" -msgstr "" +msgstr "ID Kyçe" #: config/chroot_local-includes/usr/local/bin/gpgApplet:360 msgid "Status" @@ -142,7 +142,7 @@ msgstr[1] "ID-të e përdoruesve" #: config/chroot_local-includes/usr/local/bin/gpgApplet:425 msgid "None (Don't sign)" -msgstr "" +msgstr "Asnjë (Mos nënshkruani)" #: config/chroot_local-includes/usr/local/bin/gpgApplet:488 msgid "Select recipients:" @@ -215,7 +215,7 @@ msgstr "Rezultatet GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:820 msgid "Output of GnuPG:" -msgstr "" +msgstr "Produkti i GnuPG:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:845 msgid "Other messages provided by GnuPG:" @@ -236,7 +236,7 @@ msgstr "i padisponueshëm" #: config/chroot_local-includes/usr/local/bin/tails-about:19 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 msgid "Tails" -msgstr "" +msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:24 msgid "The Amnesic Incognito Live System" @@ -252,13 +252,13 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-about:27 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 msgid "About Tails" -msgstr "" +msgstr "Rreth Tails" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" -msgstr "" +msgstr "Programi juaj shtesë" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129

1 0

[torspec/master] Specify that hidden service descriptor address is ipv4
by nickm＠torproject.org 25 Feb '15

25 Feb '15

commit e9e6450f1be3e5eaf2fbb61fa703a5a783e6a020 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 24 08:28:24 2015 -0800 Specify that hidden service descriptor address is ipv4 Clarification for #15010. Using the type defined in the dir-spec... ip4 ::= an IPv4 address in dotted-quad format --- rend-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rend-spec.txt b/rend-spec.txt index 99a13d1..a203453 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -348,7 +348,7 @@ The identifier of this introduction point: the base32 encoded hash of this introduction point's identity key. - "ip-address" SP ip-address NL + "ip-address" SP ip4 NL [Exactly once]

1 0

[torspec/master] Specify that hidden service version numbers are positive integers
by nickm＠torproject.org 25 Feb '15

25 Feb '15

commit ae07a30d020c543e8fcaac4f90146d981a2ad00e Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 24 08:30:57 2015 -0800 Specify that hidden service version numbers are positive integers Clarification for #15010. This specifies that both the hidden service descriptors and INTRODUCE cell versions must be positive ints. I tried to find a more succinct example in the dir-spec (thought there might be a POSITIVE_INT type or something like that) but no luck. --- rend-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rend-spec.txt b/rend-spec.txt index a203453..5dd1828 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -277,7 +277,8 @@ [Exactly once] - The version number of this descriptor's format. In this case: 2. + The version number of this descriptor's format. Version numbers are a + positive integer. "permanent-key" NL a public key in PEM format @@ -309,7 +310,7 @@ A comma-separated list of recognized and permitted version numbers for use in INTRODUCE cells; these versions are described in section - 1.8 below. + 1.8 below. Version numbers are positive integers. "introduction-points" NL encrypted-string

1 0

[torspec/master] Merge remote-tracking branch 'atagar/15010'
by nickm＠torproject.org 25 Feb '15

25 Feb '15

commit 5bdd3937799010a9617b51a2f0260908d5849ea6 Merge: ed1a0db ae07a30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 25 09:32:07 2015 -0500 Merge remote-tracking branch 'atagar/15010' rend-spec.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/master] Dropping test_cmdline_args.py
by nickm＠torproject.org 25 Feb '15

25 Feb '15

commit 44abbf5ab6b822932e6c4a82d77b57bf98cea499 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 8 20:42:55 2015 -0800 Dropping test_cmdline_args.py Before a couple weeks ago didn't know Tor had these tests, interesting! Stem already has tests for spawning tor processes but lacked any with this targeted focus on its arguments. I've added our own counterpart for these tests. Many are direct copies but there were others I improved a little... https://trac.torproject.org/projects/tor/ticket/14109 https://gitweb.torproject.org/stem.git/commit/?id=137d193a026638f066e817e33… Now that Tor uses Stem to supplement its tests no reason for these to live separately. Tested by simply building tor and confirming test_cmdline_args.py is no longer in the generated Makefile. --- changes/bug14806 | 3 + src/test/include.am | 2 - src/test/test_cmdline_args.py | 311 ----------------------------------------- 3 files changed, 3 insertions(+), 313 deletions(-) diff --git a/changes/bug14806 b/changes/bug14806 new file mode 100644 index 0000000..3a2e355 --- /dev/null +++ b/changes/bug14806 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Commandline argument tests moved to Stem. Fixes bug 14806. + diff --git a/src/test/include.am b/src/test/include.am index 595be0b..26b51f6 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -152,7 +152,6 @@ src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR) if USEPYTHON - $(PYTHON) $(top_srcdir)/src/test/test_cmdline_args.py $(CMDLINE_TEST_TOR) "${top_srcdir}" $(PYTHON) $(top_srcdir)/src/test/ntor_ref.py test-tor $(PYTHON) $(top_srcdir)/src/test/ntor_ref.py self-test ./src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py @@ -164,5 +163,4 @@ EXTRA_DIST += \ src/test/bt_test.py \ src/test/ntor_ref.py \ src/test/slownacl_curve25519.py \ - src/test/test_cmdline_args.py \ src/test/zero_length_keys.sh diff --git a/src/test/test_cmdline_args.py b/src/test/test_cmdline_args.py deleted file mode 100755 index 5764197..0000000 --- a/src/test/test_cmdline_args.py +++ /dev/null @@ -1,311 +0,0 @@ -#!/usr/bin/python - -import binascii -import hashlib -import os -import re -import shutil -import subprocess -import sys -import tempfile -import unittest - -TOR = "./src/or/tor" -TOP_SRCDIR = "." - -if len(sys.argv) > 1: - TOR = sys.argv[1] - del sys.argv[1] - -if len(sys.argv) > 1: - TOP_SRCDIR = sys.argv[1] - del sys.argv[1] - -class UnexpectedSuccess(Exception): - pass - -class UnexpectedFailure(Exception): - pass - -if sys.version < '3': - def b2s(b): - return b - def s2b(s): - return s - def NamedTemporaryFile(): - return tempfile.NamedTemporaryFile(delete=False) -else: - def b2s(b): - return str(b, 'ascii') - def s2b(s): - return s.encode('ascii') - def NamedTemporaryFile(): - return tempfile.NamedTemporaryFile(mode="w",delete=False,encoding="ascii") - -def contents(fn): - f = open(fn) - try: - return f.read() - finally: - f.close() - -def run_tor(args, failure=False, stdin=None): - kwargs = {} - if stdin != None: - kwargs['stdin'] = subprocess.PIPE - p = subprocess.Popen([TOR] + args, stdout=subprocess.PIPE, **kwargs) - output, _ = p.communicate(input=stdin) - result = p.poll() - if result and not failure: - raise UnexpectedFailure() - elif not result and failure: - raise UnexpectedSuccess() - return b2s(output.replace('\r\n','\n')) - -def spaceify_fp(fp): - for i in range(0, len(fp), 4): - yield fp[i:i+4] - -def lines(s): - out = s.splitlines() - if out and out[-1] == '': - del out[-1] - return out - -def strip_log_junk(line): - m = re.match(r'([^\[]+\[[a-z]*\] *)(.*)', line) - if not m: - return ""+line - return m.group(2).strip() - -def randstring(entropy_bytes): - s = os.urandom(entropy_bytes) - return b2s(binascii.b2a_hex(s)) - -def findLineContaining(lines, s): - for ln in lines: - if s in ln: - return True - return False - -class CmdlineTests(unittest.TestCase): - - def test_version(self): - out = run_tor(["--version"]) - self.assertTrue(out.startswith("Tor version ")) - self.assertEqual(len(lines(out)), 1) - - def test_quiet(self): - out = run_tor(["--quiet", "--quumblebluffin", "1"], failure=True) - self.assertEqual(out, "") - - def test_help(self): - out = run_tor(["--help"], failure=False) - out2 = run_tor(["-h"], failure=False) - self.assertTrue(out.startswith("Copyright (c) 2001")) - self.assertTrue(out.endswith( - "tor -f <torrc> [args]\n" - "See man page for options, or https://www.torproject.org/ for documentation.\n")) - self.assertTrue(out == out2) - - def test_hush(self): - torrc = NamedTemporaryFile() - torrc.close() - try: - out = run_tor(["--hush", "-f", torrc.name, - "--quumblebluffin", "1"], failure=True) - finally: - os.unlink(torrc.name) - self.assertEqual(len(lines(out)), 2) - ln = [ strip_log_junk(l) for l in lines(out) ] - self.assertEqual(ln[0], "Failed to parse/validate config: Unknown option 'quumblebluffin'. Failing.") - self.assertEqual(ln[1], "Reading config failed--see warnings above.") - - def test_missing_argument(self): - out = run_tor(["--hush", "--hash-password"], failure=True) - self.assertEqual(len(lines(out)), 2) - ln = [ strip_log_junk(l) for l in lines(out) ] - self.assertEqual(ln[0], "Command-line option '--hash-password' with no value. Failing.") - - def test_hash_password(self): - out = run_tor(["--hash-password", "woodwose"]) - result = lines(out)[-1] - self.assertEqual(result[:3], "16:") - self.assertEqual(len(result), 61) - r = binascii.a2b_hex(result[3:]) - self.assertEqual(len(r), 29) - - salt, how, hashed = r[:8], r[8], r[9:] - self.assertEqual(len(hashed), 20) - if type(how) == type("A"): - how = ord(how) - - count = (16 + (how & 15)) << ((how >> 4) + 6) - stuff = salt + s2b("woodwose") - repetitions = count // len(stuff) + 1 - inp = stuff * repetitions - inp = inp[:count] - - self.assertEqual(hashlib.sha1(inp).digest(), hashed) - - def test_digests(self): - main_c = os.path.join(TOP_SRCDIR, "src", "or", "main.c") - - if os.stat(TOR).st_mtime < os.stat(main_c).st_mtime: - self.skipTest(TOR+" not up to date") - out = run_tor(["--digests"]) - main_line = [ l for l in lines(out) if l.endswith("/main.c") or l.endswith(" main.c") ] - digest, name = main_line[0].split() - f = open(main_c, 'rb') - actual = hashlib.sha1(f.read()).hexdigest() - f.close() - self.assertEqual(digest, actual) - - def test_dump_options(self): - default_torrc = NamedTemporaryFile() - torrc = NamedTemporaryFile() - torrc.write("SocksPort 9999") - torrc.close() - default_torrc.write("SafeLogging 0") - default_torrc.close() - out_sh = out_nb = out_fl = None - opts = [ "-f", torrc.name, - "--defaults-torrc", default_torrc.name ] - try: - out_sh = run_tor(["--dump-config", "short"]+opts) - out_nb = run_tor(["--dump-config", "non-builtin"]+opts) - out_fl = run_tor(["--dump-config", "full"]+opts) - out_nr = run_tor(["--dump-config", "bliznert"]+opts, - failure=True) - - out_verif = run_tor(["--verify-config"]+opts) - finally: - os.unlink(torrc.name) - os.unlink(default_torrc.name) - - self.assertEqual(len(lines(out_sh)), 2) - self.assertTrue(lines(out_sh)[0].startswith("DataDirectory ")) - self.assertEqual(lines(out_sh)[1:], - [ "SocksPort 9999" ]) - - self.assertEqual(len(lines(out_nb)), 2) - self.assertEqual(lines(out_nb), - [ "SafeLogging 0", - "SocksPort 9999" ]) - - out_fl = lines(out_fl) - self.assertTrue(len(out_fl) > 100) - self.assertTrue("SocksPort 9999" in out_fl) - self.assertTrue("SafeLogging 0" in out_fl) - self.assertTrue("ClientOnly 0" in out_fl) - - self.assertTrue(out_verif.endswith("Configuration was valid\n")) - - def test_list_fingerprint(self): - tmpdir = tempfile.mkdtemp(prefix='ttca_') - torrc = NamedTemporaryFile() - torrc.write("ORPort 9999\n") - torrc.write("DataDirectory %s\n"%tmpdir) - torrc.write("Nickname tippi") - torrc.close() - opts = ["-f", torrc.name] - try: - out = run_tor(["--list-fingerprint"]+opts) - fp = contents(os.path.join(tmpdir, "fingerprint")) - finally: - os.unlink(torrc.name) - shutil.rmtree(tmpdir) - - out = lines(out) - lastlog = strip_log_junk(out[-2]) - lastline = out[-1] - fp = fp.strip() - nn_fp = fp.split()[0] - space_fp = " ".join(spaceify_fp(fp.split()[1])) - self.assertEqual(lastlog, - "Your Tor server's identity key fingerprint is '%s'"%fp) - self.assertEqual(lastline, "tippi %s"%space_fp) - self.assertEqual(nn_fp, "tippi") - - def test_list_options(self): - out = lines(run_tor(["--list-torrc-options"])) - self.assertTrue(len(out)>100) - self.assertTrue(out[0] <= 'AccountingMax') - self.assertTrue("UseBridges" in out) - self.assertTrue("SocksPort" in out) - - def test_cmdline_args(self): - default_torrc = NamedTemporaryFile() - torrc = NamedTemporaryFile() - contents = ("SocksPort 9999\n" - "SocksPort 9998\n" - "ORPort 9000\n" - "ORPort 9001\n" - "Nickname eleventeen\n" - "ControlPort 9500\n") - torrc.write(contents) - default_torrc.write("") - default_torrc.close() - torrc.close() - out_sh = out_nb = out_fl = None - - opts_stdin = [ "-f", "-", - "--defaults-torrc", default_torrc.name, - "--dump-config", "short" ] - opts = [ "-f", torrc.name, - "--defaults-torrc", default_torrc.name, - "--dump-config", "short" ] - try: - out_0 = run_tor(opts_stdin,stdin=contents) - out_1 = run_tor(opts) - out_2 = run_tor(opts+["+ORPort", "9003", - "SocksPort", "9090", - "/ControlPort", - "/TransPort", - "+ExtORPort", "9005"]) - finally: - os.unlink(torrc.name) - os.unlink(default_torrc.name) - - out_0 = [ l for l in lines(out_0) if not l.startswith("DataDir") ] - out_1 = [ l for l in lines(out_1) if not l.startswith("DataDir") ] - out_2 = [ l for l in lines(out_2) if not l.startswith("DataDir") ] - - self.assertEqual(out_0, - ["ControlPort 9500", - "Nickname eleventeen", - "ORPort 9000", - "ORPort 9001", - "SocksPort 9999", - "SocksPort 9998"]) - - self.assertEqual(out_1, - ["ControlPort 9500", - "Nickname eleventeen", - "ORPort 9000", - "ORPort 9001", - "SocksPort 9999", - "SocksPort 9998"]) - - self.assertEqual(out_2, - ["ExtORPort 9005", - "Nickname eleventeen", - "ORPort 9000", - "ORPort 9001", - "ORPort 9003", - "SocksPort 9090"]) - - def test_missing_torrc(self): - fname = "nonexistent_file_"+randstring(8) - out = run_tor(["-f", fname, "--verify-config"], failure=True) - ln = [ strip_log_junk(l) for l in lines(out) ] - self.assertTrue("Unable to open configuration file" in ln[-2]) - self.assertTrue("Reading config failed" in ln[-1]) - - out = run_tor(["-f", fname, "--verify-config", "--ignore-missing-torrc"]) - ln = [ strip_log_junk(l) for l in lines(out) ] - self.assertTrue(findLineContaining(ln, ", using reasonable defaults")) - self.assertTrue("Configuration was valid" in ln[-1]) - -if __name__ == '__main__': - unittest.main()

1 0

[tor/master] Merge remote-tracking branch 'atagar/trac14806'
by nickm＠torproject.org 25 Feb '15

25 Feb '15

commit 1b913777c78e61897e530a91f5c60c8a94a2c1c7 Merge: cf55070 44abbf5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 25 09:30:29 2015 -0500 Merge remote-tracking branch 'atagar/trac14806' changes/bug14806 | 3 + src/test/include.am | 2 - src/test/test_cmdline_args.py | 311 ----------------------------------------- 3 files changed, 3 insertions(+), 313 deletions(-)

1 0

[tor/master] Standardize on calling them "server descriptors".
by nickm＠torproject.org 25 Feb '15

25 Feb '15

commit cf55070e2c659a9af7835db851dd3f73f1d0d1ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 25 09:22:03 2015 -0500 Standardize on calling them "server descriptors". Part of 14987 --- changes/bug14987b-doc | 4 ++++ doc/tor.1.txt | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/changes/bug14987b-doc b/changes/bug14987b-doc new file mode 100644 index 0000000..b8b2392 --- /dev/null +++ b/changes/bug14987b-doc @@ -0,0 +1,4 @@ + o Documentation: + - Standardize on the term "server descriptor" in the manual page. + Previously, we had used "router descriptor", "server descriptor", + and "relay descriptor" interchangeably. Part of ticket 14987. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e136bd0..a77cb9b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1311,7 +1311,7 @@ The following options are useful only for clients (that is, if [[DownloadExtraInfo]] **DownloadExtraInfo** **0**|**1**:: If true, Tor downloads and caches "extra-info" documents. These documents contain information about servers other than the information in their - regular router descriptors. Tor does not use this information for anything + regular server descriptors. Tor does not use this information for anything itself; to save bandwidth, leave this option turned off. (Default: 0) [[WarnPlaintextPorts]] **WarnPlaintextPorts** __port__,__port__,__...__:: @@ -1490,8 +1490,8 @@ is non-zero): [[BridgeRelay]] **BridgeRelay** **0**|**1**:: Sets the relay to act as a "bridge" with respect to relaying connections from bridge users to the Tor network. It mainly causes Tor to publish a - server descriptor to the bridge database, rather than publishing a relay - descriptor to the public directory authorities. + server descriptor to the bridge database, rather than + to the public directory authorities. [[ContactInfo]] **ContactInfo** __email_address__:: Administrative contact information for this relay or bridge. This line @@ -1929,7 +1929,7 @@ on the public Tor network. [[BridgeAuthoritativeDir]] **BridgeAuthoritativeDir** **0**|**1**:: When this option is set in addition to **AuthoritativeDirectory**, Tor - accepts and serves router descriptors, but it caches and serves the main + accepts and serves server descriptors, but it caches and serves the main networkstatus documents rather than generating its own. (Default: 0) [[MinUptimeHidServDirectoryV2]] **MinUptimeHidServDirectoryV2** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: @@ -1948,9 +1948,9 @@ on the public Tor network. in the "params" line of its networkstatus vote. [[DirAllowPrivateAddresses]] **DirAllowPrivateAddresses** **0**|**1**:: - If set to 1, Tor will accept router descriptors with arbitrary "Address" + If set to 1, Tor will accept server descriptors with arbitrary "Address" elements. Otherwise, if the address is not an IP address or is a private IP - address, it will reject the router descriptor. (Default: 0) + address, it will reject the server descriptor. (Default: 0) [[AuthDirBadExit]] **AuthDirBadExit** __AddressPattern...__:: Authoritative directories only. A set of address patterns for servers that @@ -2212,7 +2212,7 @@ The following options are used for running a testing Tor network. that **TestingTorNetwork** is set. (Default: 30 minutes) [[TestingEstimatedDescriptorPropagationTime]] **TestingEstimatedDescriptorPropagationTime** __N__ **minutes**|**hours**:: - Clients try downloading router descriptors from directory caches after this + Clients try downloading server descriptors from directory caches after this time. Changing this requires that **TestingTorNetwork** is set. (Default: 10 minutes) @@ -2260,7 +2260,7 @@ The following options are used for running a testing Tor network. this requires that **TestingTorNetwork** is set. (Default: 8) [[TestingDescriptorMaxDownloadTries]] **TestingDescriptorMaxDownloadTries** __NUM__:: - Try this often to download a router descriptor before giving up. + Try this often to download a server descriptor before giving up. Changing this requires that **TestingTorNetwork** is set. (Default: 8) [[TestingMicrodescMaxDownloadTries]] **TestingMicrodescMaxDownloadTries** __NUM__:: @@ -2402,7 +2402,7 @@ __DataDirectory__**/state**:: below). - When the file was last written - What version of Tor generated the state file - - A short history of bandwidth usage, as produced in the router + - A short history of bandwidth usage, as produced in the server descriptors. __DataDirectory__**/bw_accounting**:: @@ -2447,7 +2447,7 @@ __DataDirectory__**/unverified-microdesc-consensus**:: to check yet. __DataDirectory__**/unparseable-desc**:: - Onion router descriptors that Tor was unable to parse are dumped to this + Onion server descriptors that Tor was unable to parse are dumped to this file. Only used for debugging. __DataDirectory__**/router-stability**::

1 0

[torspec/master] Standardizing on the name 'server descriptor'
by nickm＠torproject.org 25 Feb '15

25 Feb '15

commit ed1a0dbfbb9b4a9075a96e256988360bb157775f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 24 20:12:39 2015 -0800 Standardizing on the name 'server descriptor' We use a few names for the main self-published descriptor documents... https://trac.torproject.org/projects/tor/ticket/14987 Standardizing on the name 'server descriptor'. This change was made with a few quick runs of sed... % find ./* -type f -exec sed -i 's/router descriptor/server descriptor/' "{}" +; % find ./* -type f -exec sed -i 's/Router descriptor/Server descriptor/' "{}" +; % find ./* -type f -exec sed -i 's/Router Descriptor/Server Descriptor/' "{}" +; ... then reverting the attic changes, and scanning the rest to be sure it doesn't include any functional impact. --- control-spec.txt | 6 ++--- dir-spec.txt | 78 +++++++++++++++++++++++++++--------------------------- path-spec.txt | 4 +-- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 871c353..b527a40 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1703,7 +1703,7 @@ 4.1.8. Descriptors uploaded to us in our role as authoritative dirserver Tor generates this event when it's an directory authority, and - somebody has just uploaded a router descriptor. + somebody has just uploaded a server descriptor. Syntax: "650" "+" "AUTHDIR_NEWDESCS" CRLF Action CRLF Message CRLF @@ -1711,7 +1711,7 @@ Action = "ACCEPTED" / "DROPPED" / "REJECTED" Message = Text - The Descriptor field is the text of the router descriptor; the Action + The Descriptor field is the text of the server descriptor; the Action field is "ACCEPTED" if we're accepting the descriptor as the new best valid descriptor for its router, "REJECTED" if we aren't taking the descriptor and we're complaining to the uploading relay about @@ -1946,7 +1946,7 @@ to tell them so.} NOT_ENOUGH_DIR_INFO - We discarded expired statuses and router descriptors to fall + We discarded expired statuses and server descriptors to fall below the desired threshold of directory information. We won't try to build any circuits until ENOUGH_DIR_INFO occurs again. diff --git a/dir-spec.txt b/dir-spec.txt index f74b16d..85492e9 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -33,7 +33,7 @@ Early versions of Tor (0.0.2) introduced "Directory authorities": servers that served signed "directory" documents containing a list of signed - "router descriptors", along with short summary of the status of each + "server descriptors", along with short summary of the status of each router. Thus, clients could get up-to-date information on the state of the network automatically, and be certain that the list they were getting was attested by a trusted directory authority. @@ -56,7 +56,7 @@ documents in order to address two major problems: * Directories had grown quite large (over 1MB), and most directory - downloads consisted mainly of router descriptors that clients + downloads consisted mainly of server descriptors that clients already had. * Every directory authority was a trust bottleneck: if a single @@ -75,10 +75,10 @@ statements about routers iff they were attested to by more than half of the authorities. - Instead of downloading all router descriptors at once, clients + Instead of downloading all server descriptors at once, clients downloaded only the descriptors that they did not have. Descriptors were indexed by their digests, in order to prevent malicious caches - from giving different versions of a router descriptor to different + from giving different versions of a server descriptor to different clients. Routers began working harder to upload new descriptors only when their @@ -90,7 +90,7 @@ Version 3 of the Tor directory protocol tries to solve the following issues: - * A great deal of bandwidth used to transmit router descriptors was + * A great deal of bandwidth used to transmit server descriptors was used by two fields that are not actually used by Tor routers (namely read-history and write-history). We save about 60% by moving them into a separate document that most clients do not @@ -153,7 +153,7 @@ directory authorities describing their keys, capabilities, and other information. Routers may also upload signed "extra info documents" containing information that is not required for the Tor protocol. - Directory authorities serve router descriptors indexed by router + Directory authorities serve server descriptors indexed by router identity, or by hash of the descriptor. Routers may act as directory caches to reduce load on the directory @@ -170,7 +170,7 @@ Clients, directory caches, and directory authorities all use consensus documents to find out when their list of routers is out-of-date. (Directory authorities also use vote statuses.) If it is, they download - any missing router descriptors. Clients download missing descriptors + any missing server descriptors. Clients download missing descriptors from caches; caches and authorities download from authorities. Descriptors are downloaded by the hash of the descriptor, not by the relay's identity key: this prevents directory servers from attacking @@ -193,7 +193,7 @@ 1.2. Document meta-format - Router descriptors, directories, and running-routers documents all obey the + Server descriptors, directories, and running-routers documents all obey the following lightweight extensible information format. The highest level object is a Document, which consists of one or more @@ -319,9 +319,9 @@ 2. Router operation and formats -2.1. Uploading router descriptors and extra-info documents +2.1. Uploading server descriptors and extra-info documents - ORs SHOULD generate a new router descriptor and a new extra-info + ORs SHOULD generate a new server descriptor and a new extra-info document whenever any of the following events have occurred: - A period of time (18 hrs by default) has passed since the last @@ -338,7 +338,7 @@ [XXX this list is incomplete; see router_differences_are_cosmetic() in routerlist.c for others] - ORs SHOULD NOT publish a new router descriptor or extra-info document + ORs SHOULD NOT publish a new server descriptor or extra-info document if none of the above events have occurred and not much time has passed (12 hours by default). @@ -347,13 +347,13 @@ http://<hostname:port>/tor/ - Router descriptors may not exceed 20,000 bytes in length; extra-info + Server descriptors may not exceed 20,000 bytes in length; extra-info documents may not exceed 50,000 bytes in length. If they do, the authorities SHOULD reject them. -2.1.1. Router descriptor format +2.1.1. Server descriptor format - Router descriptors consist of the following items. For backward + Server descriptors consist of the following items. For backward compatibility, there should be an extra NL at the end of each router descriptor. @@ -365,7 +365,7 @@ [At start, exactly once.] - Indicates the beginning of a router descriptor. "nickname" must be a + Indicates the beginning of a server descriptor. "nickname" must be a valid router nickname as specified in section 2.1.3. "address" must be an IPv4 address in dotted-quad format. The last three numbers indicate the @@ -490,9 +490,9 @@ [At end, exactly once] The "SIGNATURE" object contains a signature of the PKCS1-padded - hash of the entire router descriptor, taken from the beginning of the + hash of the entire server descriptor, taken from the beginning of the "router" line, through the newline after the "router-signature" line. - The router descriptor is invalid unless the signature is performed + The server descriptor is invalid unless the signature is performed with the router's identity key. "contact" info NL @@ -632,7 +632,7 @@ The time, in UTC, when this document (and its corresponding router descriptor if any) was generated. It MUST match the published time - in the corresponding router descriptor. + in the corresponding server descriptor. "read-history" YYYY-MM-DD HH:MM:SS (NSEC s) NUM,NUM,NUM,NUM,NUM... NL [At most once.] @@ -975,17 +975,17 @@ 2.1.2.1. Moving history fields to extra-info documents Tools that want to use the read-history and write-history values SHOULD - download extra-info documents as well as router descriptors. Such + download extra-info documents as well as server descriptors. Such tools SHOULD accept history values from both sources; if they appear in both documents, the values in the extra-info documents are authoritative. - New versions of Tor no longer generate router descriptors + New versions of Tor no longer generate server descriptors containing read-history or write-history. Tools should continue to - accept read-history and write-history values in router descriptors + accept read-history and write-history values in server descriptors produced by older versions of Tor until all Tor versions earlier than 0.2.0.x are obsolete. -2.1.3. Nonterminals in router descriptors +2.1.3. Nonterminals in server descriptors nickname ::= between 1 and 19 alphanumeric characters ([A-Za-z0-9]), case-insensitive. @@ -1098,7 +1098,7 @@ Authorities MUST generate a new signing key and corresponding certificate before the key expires. -3.2. Accepting router descriptor and extra-info document uploads +3.2. Accepting server descriptor and extra-info document uploads When a router posts a signed descriptor to a directory authority, the authority first checks whether it is well-formed and correctly @@ -1120,7 +1120,7 @@ - Enough time has passed between the descriptors' publication times. (Currently, 12 hours.) - Differences between router descriptors are "non-cosmetic" if they would be + Differences between server descriptors are "non-cosmetic" if they would be sufficient to force an upload as described in section 2.1 above. Note that the "cosmetic difference" test only applies to uploaded @@ -1135,7 +1135,7 @@ 3.3. Computing microdescriptors - Microdescriptors are a stripped-down version of router descriptors + Microdescriptors are a stripped-down version of server descriptors generated by the directory authorities which may additionally contain authority-generated information. Microdescriptors contain only the most relevant parts that clients care about. Microdescriptors are @@ -1144,7 +1144,7 @@ use to decide which servers to fetch information about, or which servers to fetch information from. - Microdescriptors are a straight transform from the router descriptor + Microdescriptors are a straight transform from the server descriptor and the consensus method. Microdescriptors have no header or footer. Microdescriptors are identified by the hash of its concatenated elements without a signature by the router. Microdescriptors do not @@ -1152,9 +1152,9 @@ by the consensus method. Starting with consensus method 8, microdescriptors contain the - following elements taken from or based on the router descriptor. Order + following elements taken from or based on the server descriptor. Order matters here, because different directory authorities must be able to - transform a given router descriptor and consensus method into the exact + transform a given server descriptor and consensus method into the exact same microdescriptor. "onion-key" NL a public key in PEM format @@ -1955,7 +1955,7 @@ The bandwidth in a "w" line should be taken as the best estimate of the router's actual capacity that the authority has. For now, this should be the lesser of the observed bandwidth and bandwidth - rate limit from the router descriptor. It is given in kilobytes + rate limit from the server descriptor. It is given in kilobytes per second, and capped at some arbitrary value (currently 10 MB/s). The Measured= keyword on a "w" line vote is currently computed @@ -1976,7 +1976,7 @@ XXX when to download certificates. -3.6. Downloading router descriptors from other directory authorities +3.6. Downloading server descriptors from other directory authorities Periodically (currently, every 10 seconds), directory authorities check whether there are any specific descriptors that they do not have and that @@ -2011,7 +2011,7 @@ 3.7. Downloading extra-info documents from other directory authorities Periodically, an authority checks whether it is missing any extra-info - documents: in other words, if it has any router descriptors with an + documents: in other words, if it has any server descriptors with an extra-info-digest field that does not match any of the extra-info documents currently held. If so, it downloads whatever extra-info documents are missing. We follow the same splitting and back-off rules @@ -2608,7 +2608,7 @@ length. Caches serve all consensus flavors from the same locations as the directory authorities. -4.2. Downloading router descriptors from directory authorities +4.2. Downloading server descriptors from directory authorities Periodically (currently, every 10 seconds), directory caches check whether there are any specific descriptors that they do not have and that @@ -2658,7 +2658,7 @@ section. Periodically, the Tor instance checks whether it is missing any extra-info - documents: in other words, if it has any router descriptors with an + documents: in other words, if it has any server descriptors with an extra-info-digest field that does not match any of the extra-info documents currently held. If so, it downloads whatever extra-info documents are missing. Caches download from authorities. We follow the @@ -2732,7 +2732,7 @@ the same update strategy as for the normal consensus. They should not download more than one consensus flavor. -5.2. Downloading router descriptors or microdescriptors +5.2. Downloading server descriptors or microdescriptors Clients try to have the best descriptor for each router. A descriptor is "best" if: @@ -2754,7 +2754,7 @@ client tried to download descriptors, it launches requests for all downloadable descriptors. - When downloading multiple router descriptors, the client chooses multiple + When downloading multiple server descriptors, the client chooses multiple mirrors so that: - At least 3 different mirrors are used, except when this would result in more than one request for under 4 descriptors. @@ -2783,7 +2783,7 @@ Clients which chose to download the microdescriptor consensus instead of the general consensus must download the referenced microdescriptors - instead of router descriptors. Clients fetch and cache + instead of server descriptors. Clients fetch and cache microdescriptors preemptively from dir mirrors when starting up, like they currently fetch descriptors. After bootstrapping, clients only need to fetch the microdescriptors that have changed. @@ -2811,7 +2811,7 @@ Note that generally, clients don't need extra-info documents. Periodically, the Tor instance checks whether it is missing any extra-info - documents: in other words, if it has any router descriptors with an + documents: in other words, if it has any server descriptors with an extra-info-digest field that does not match any of the extra-info documents currently held. If so, it downloads whatever extra-info documents are missing. Clients try to download from caches. @@ -2932,8 +2932,8 @@ them. Servers SHOULD disable caching of multiple network statuses or multiple - router descriptors. Servers MAY enable caching of single descriptors, - single network statuses, the list of all router descriptors, a v1 + server descriptors. Servers MAY enable caching of single descriptors, + single network statuses, the list of all server descriptors, a v1 directory, or a v1 running routers document. XXX mention times. 6.2. HTTP status codes diff --git a/path-spec.txt b/path-spec.txt index 64886dc..896195a 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -602,9 +602,9 @@ of their choices. Tor does not add a guard persistently to the list until the first time we have connected to it successfully. -6. Router descriptor purposes +6. Server descriptor purposes - There are currently three "purposes" supported for router descriptors: + There are currently three "purposes" supported for server descriptors: general, controller, and bridge. Most descriptors are of type general -- these are the ones listed in the consensus, and the ones fetched and used in normal cases.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2015