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

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 06 Jul '20

06 Jul '20

commit 4ee78c414d64ff34dcaba02bf588923e8498005f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 6 15:47:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index ea3f6d5c2f..9cb33127e4 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -84,7 +84,7 @@ msgstr "" "Avez-vous besoin d’aide ? Visitez notre [portail " "d’assistance](https://support.torproject.org/fr/) pour obtenir des réponses " "aux questions les plus fréquentes sur la connexion à Tor, le contournement " -"de la censure, l’utilisation des services onion et plus encore." +"de la censure, l’utilisation des services onion et plus encore." #: https//www.torproject.org/download/ #: (content/download/contents+en.lrpage.title) @@ -1548,7 +1548,7 @@ msgstr "Le Navigateur Tor" #: templates/press.html:30 msgid "Onion Services" -msgstr "Les services onion" +msgstr "Les services onion" #: templates/press.html:40 msgid "Press Releases"

1 0

[translation/tor_outreach_md_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md_completed
by translation＠torproject.org 06 Jul '20

06 Jul '20

commit f2f70281ed9ae8209b1f9124d071136f1dc38f73 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 6 15:47:54 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md_com… --- tor-outreach2019-2020-fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-outreach2019-2020-fr.md b/tor-outreach2019-2020-fr.md index 47ad90724a..2f12c9fc15 100644 --- a/tor-outreach2019-2020-fr.md +++ b/tor-outreach2019-2020-fr.md @@ -26,7 +26,7 @@ Fernanda et ses collègues ont créé un site Web qui offre des renseignements s Si l’on pouvait remonter la trace de ce site Web jusqu’à elles, elles pourraient être arrêtées ou pire encore. -Pour se protéger, Fernanda et ses collègues ont créé le site Web en utilisant les **services onion** de Tor. Non seulement les services onion empêchent qu’elles soient découvertes comme opératrices du serveur, mais ils aident aussi à protéger les visiteurs de leur site Web en exigeant qu’ils utilisent le Navigateur Tor. +Pour se protéger, Fernanda et ses collègues ont créé le site Web en utilisant les **services onion** de Tor. Non seulement les services onion empêchent qu’elles soient découvertes comme opératrices du serveur, mais ils aident aussi à protéger les visiteurs de leur site Web en exigeant qu’ils utilisent le Navigateur Tor. En fait, Fernanda utilise le **Navigateur Tor** pour toute sa navigation sur la Toile, simplement par mesure de sécurité.

1 0

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 06 Jul '20

06 Jul '20

commit 83b6435b0d3a04156c41bd54eae7de49c4ca6f59 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 6 15:47:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-outreach2019-2020-fr.md b/tor-outreach2019-2020-fr.md index 47ad90724a..2f12c9fc15 100644 --- a/tor-outreach2019-2020-fr.md +++ b/tor-outreach2019-2020-fr.md @@ -26,7 +26,7 @@ Fernanda et ses collègues ont créé un site Web qui offre des renseignements s Si l’on pouvait remonter la trace de ce site Web jusqu’à elles, elles pourraient être arrêtées ou pire encore. -Pour se protéger, Fernanda et ses collègues ont créé le site Web en utilisant les **services onion** de Tor. Non seulement les services onion empêchent qu’elles soient découvertes comme opératrices du serveur, mais ils aident aussi à protéger les visiteurs de leur site Web en exigeant qu’ils utilisent le Navigateur Tor. +Pour se protéger, Fernanda et ses collègues ont créé le site Web en utilisant les **services onion** de Tor. Non seulement les services onion empêchent qu’elles soient découvertes comme opératrices du serveur, mais ils aident aussi à protéger les visiteurs de leur site Web en exigeant qu’ils utilisent le Navigateur Tor. En fait, Fernanda utilise le **Navigateur Tor** pour toute sa navigation sur la Toile, simplement par mesure de sécurité.

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 06 Jul '20

06 Jul '20

commit af2199de82e4dca9577dabca51c06e6966cddab6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 6 15:47:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+fr.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index a49b15f892..db1ff3a220 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -107,7 +107,7 @@ msgstr "Gestion des identités" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Onion Services" -msgstr "Services onion" +msgstr "Services onion" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -1471,7 +1471,7 @@ msgid "" "Onion services (formerly known as “hidden services”) are services (like " "websites) that are only accessible through the Tor network." msgstr "" -"Les services onion (anciennement « services cachés ») sont des services " +"Les services onion (anciennement « services cachés ») sont des services " "(tels que des sites Web) qui ne sont accessibles que par le réseau Tor." #: https//tb-manual.torproject.org/onion-services/ @@ -1480,7 +1480,7 @@ msgid "" "Onion services offer several advantages over ordinary services on the non-" "private web:" msgstr "" -"Les services onion offrent plusieurs avantages par rapport aux services " +"Les services onion offrent plusieurs avantages par rapport aux services " "ordinaires du Web non privé :" #: https//tb-manual.torproject.org/onion-services/ @@ -1489,7 +1489,7 @@ msgid "" "* An onion services’s location and IP address are hidden, making it " "difficult for adversaries to censor it or identify its operators." msgstr "" -"* L’emplacement géographique et l’adresse IP d’un service onion sont cachés," +"* L’emplacement géographique et l’adresse IP d’un service onion sont cachés," " et il est donc difficile pour ses adversaires de le censurer ou " "d’identifier ses opérateurs." @@ -1500,7 +1500,7 @@ msgid "" "so you do not need to worry about [connecting over HTTPS](/secure-" "connections)." msgstr "" -"* Tout le trafic entre les utilisateurs de Tor et les services onion est " +"* Tout le trafic entre les utilisateurs de Tor et les services onion est " "chiffré de bout en bout, vous n’avez donc pas à vous soucier de vous " "[connecter par HTTPS](/fr/secure-connections)." @@ -1512,7 +1512,7 @@ msgid "" "Tor ensure that it is connecting to the right location and that the " "connection is not being tampered with." msgstr "" -"* L’adresse d’un service onion est générée automatiquement, donc les " +"* L’adresse d’un service onion est générée automatiquement, donc les " "opérateurs n’ont pas à acheter un nom de domaine ; l’URL .onion aide aussi " "Tor à s’assurer qu’il se connecte au bon endroit et que la connexion n’est " "pas altérée." @@ -1529,7 +1529,7 @@ msgid "" "service in order to connect to it. An onion address is a string of 16 (and " "in V3 format, 56) mostly random letters and numbers, followed by “.onion”." msgstr "" -"Comme tout autre site Web, vous devrez connaître l’adresse d’un service " +"Comme tout autre site Web, vous devrez connaître l’adresse d’un service " "onion afin de vous y connecter. Une adresse onion est une chaîne de 16 " "lettres et chiffres (ou 56 en format V3) essentiellement aléatoires, suivie " "par « .onion »." @@ -1543,10 +1543,10 @@ msgid "" "website with https and onion service, it will show an icon of a green onion " "and a padlock." msgstr "" -"Lors de l’accès à un site Web qui utilise un service onion, le Navigateur " +"Lors de l’accès à un site Web qui utilise un service onion, le Navigateur " "Tor affichera dans la barre d’URL l’icône d’un petit oignon vert qui affiche" -" l’état de votre connexion: sécurisée et qui utilise un service onion. Et si" -" vous accédez à un site Web avec HTTPS et un service onion, il affichera " +" l’état de votre connexion: sécurisée et qui utilise un service onion. Et si" +" vous accédez à un site Web avec HTTPS et un service onion, il affichera " "l’icône d’un oignon vert et un cadenas." #: https//tb-manual.torproject.org/onion-services/ @@ -1561,7 +1561,7 @@ msgid "" "entered the onion address correctly: even a small mistake will stop Tor " "Browser from being able to reach the site." msgstr "" -"Si vous ne pouvez pas atteindre le service onion dont vous avez besoin, " +"Si vous ne pouvez pas atteindre le service onion dont vous avez besoin, " "assurez-vous d’avoir correctement saisi l’adresse onion : même une petite " "erreur empêchera le Navigateur Tor d’atteindre le site." @@ -1572,7 +1572,7 @@ msgid "" "later. There may be a temporary connection issue, or the site operators may " "have allowed it to go offline without warning." msgstr "" -"Si vous n’arrivez toujours pas à vous connecter au service onion, veuillez " +"Si vous n’arrivez toujours pas à vous connecter au service onion, veuillez " "ressayer ultérieurement. Il pourrait y avoir un problème temporaire de " "connexion ou les opérateurs du site pourraient l’avoir désactivé sans " "avertissement." @@ -1584,7 +1584,7 @@ msgid "" "connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)." msgstr "" "Vous pouvez aussi vous assurer que vous arrivez à accéder à d’autres " -"services onion en vous connectant au [service onion de " +"services onion en vous connectant au [service onion de " "DuckDuckGo](http://3g2upl4pq6kufc4m.onion/)." #: https//tb-manual.torproject.org/secure-connections/

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 06 Jul '20

06 Jul '20

commit 0789edc737f1552577f530e19b628994cda4f7ca Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 6 15:45:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/fr/LC_MESSAGES/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index b644c95386..eee1485005 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -1154,7 +1154,7 @@ msgid "" "how to run a relay." msgstr "" "J’aimerais en savoir davantage sur le fonctionnement de Tor, ce que sont les" -" services onion ou comment mettre en place un relais." +" services onion ou comment mettre en place un relais." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:241 msgid ""

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 06 Jul '20

06 Jul '20

commit 3e31aafba41af8705a06040e32204c24a47292e5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 6 15:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 45eb240964..b01d296dae 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -204,7 +204,7 @@ msgstr "" #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.title) msgid "Onion Services" -msgstr "Services onion" +msgstr "Services onion" #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.subtitle) @@ -214,7 +214,7 @@ msgid "" msgstr "" "Les services Onion vous aide vous et vos utilisateurs à combattre la " "surveillance et la censure. Apprenez comment vous pouvez déployez des " -"services onion." +"services onion." #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.cta) @@ -233,8 +233,8 @@ msgid "" "onion service gives your users all the security of HTTPS with the added " "privacy benefits of Tor Browser." msgstr "" -"Les services onion sont des services qui ne peuvent être accédés que par " -"Tor. Faire tourner un service onion donne à vos utilisateurs toute la " +"Les services onion sont des services qui ne peuvent être accédés que par " +"Tor. Faire tourner un service onion donne à vos utilisateurs toute la " "sécurité du HTTPS avec les avantages de la confidentialité du Navigateur " "Tor."

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1938/head'
by nickm＠torproject.org 06 Jul '20

06 Jul '20

commit ac3bc88343c0cb517eae59660c16f3a6cb273f44 Merge: 00f921edb 7cf031a0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 6 09:34:13 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1938/head' changes/bug34357 | 4 ++++ src/feature/dirauth/process_descs.c | 8 ++++---- src/test/test_process_descs.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/master] Reject Tor relays running the 0.4.1 series
by nickm＠torproject.org 06 Jul '20

06 Jul '20

commit 7cf031a0ccb29cef622b72821184e60eb3f41f81 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Jun 17 11:17:40 2020 -0700 Reject Tor relays running the 0.4.1 series --- changes/bug34357 | 4 ++++ src/feature/dirauth/process_descs.c | 8 ++++---- src/test/test_process_descs.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/bug34357 b/changes/bug34357 new file mode 100644 index 000000000..69fada7cc --- /dev/null +++ b/changes/bug34357 @@ -0,0 +1,4 @@ + o Minor features (directory authorities): + - Directory authorities now reject descriptors from relays running + Tor versions from the 0.4.1 series, but still allow the 0.3.5 + series. Resolves ticket 34357. Patch by Neel Chauhan. diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 5025d0ae3..bc659d032 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -409,11 +409,11 @@ dirserv_rejects_tor_version(const char *platform, return true; } - /* Series between Tor 0.3.6 and 0.4.1.4-rc inclusive are unsupported. - * Reject them. 0.3.6.0-alpha-dev only existed for a short time, before - * it was renamed to 0.4.0.0-alpha-dev. */ + /* Series between Tor 0.3.6 and 0.4.1 inclusive are unsupported. Reject + * them. 0.3.6.0-alpha-dev only existed for a short time, before it was + * renamed to 0.4.0.0-alpha-dev. */ if (tor_version_as_new_as(platform,"0.3.6.0-alpha-dev") && - !tor_version_as_new_as(platform,"0.4.1.5")) { + !tor_version_as_new_as(platform,"0.4.2.1-alpha")) { if (msg) { *msg = please_upgrade_string; } diff --git a/src/test/test_process_descs.c b/src/test/test_process_descs.c index 14865cff1..5c2301f87 100644 --- a/src/test/test_process_descs.c +++ b/src/test/test_process_descs.c @@ -38,10 +38,10 @@ test_process_descs_versions(void *arg) { "Tor 0.4.0.5", true }, { "Tor 0.4.1.1-alpha", true }, { "Tor 0.4.1.4-rc", true }, + { "Tor 0.4.1.5", true }, // new enough to be supported { "Tor 0.3.5.7", false }, { "Tor 0.3.5.8", false }, - { "Tor 0.4.1.5", false }, { "Tor 0.4.2.1-alpha", false }, { "Tor 0.4.2.4-rc", false }, { "Tor 0.4.3.0-alpha-dev", false },

1 0

[sbws/maint-1.1] fix: tests: Remove all the `\t` in torrc files
by juga＠torproject.org 06 Jul '20

06 Jul '20

commit a8c91d0baec7f77c69347bf676ca095175095030 Author: juga0 <juga(a)riseup.net> Date: Tue Jun 23 13:32:31 2020 +0000 fix: tests: Remove all the `\t` in torrc files at the beginning of the line and in empty lines. They are not needed. --- tests/integration/net/auth1/torrc | 55 +++++++++++++++--------------- tests/integration/net/auth2/torrc | 55 +++++++++++++++--------------- tests/integration/net/auth3/torrc | 55 +++++++++++++++--------------- tests/integration/net/exit1/torrc | 40 +++++++++++----------- tests/integration/net/exit2/torrc | 40 +++++++++++----------- tests/integration/net/exit3/torrc | 40 +++++++++++----------- tests/integration/net/relay1/torrc | 34 +++++++++--------- tests/integration/net/relay1mbyteMAB/torrc | 34 +++++++++--------- tests/integration/net/relay1mbyteRBR/torrc | 34 +++++++++--------- tests/integration/net/relay2/torrc | 34 +++++++++--------- tests/integration/net/relay3/torrc | 34 +++++++++--------- tests/integration/net/relay4/torrc | 34 +++++++++--------- tests/integration/net/relay5/torrc | 34 +++++++++--------- tests/integration/net/relay6/torrc | 34 +++++++++--------- tests/integration/net/relay7/torrc | 34 +++++++++--------- 15 files changed, 294 insertions(+), 297 deletions(-) diff --git a/tests/integration/net/auth1/torrc b/tests/integration/net/auth1/torrc index 464a7fd..1318647 100644 --- a/tests/integration/net/auth1/torrc +++ b/tests/integration/net/auth1/torrc @@ -1,34 +1,33 @@ - DataDirectory auth1 - PidFile auth1/tor.pid - Log notice file auth1/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - AuthoritativeDirectory 1 - V3AuthoritativeDirectory 1 - Address 127.10.0.1 - SocksPort 127.10.0.1:2000 - ControlPort 127.10.0.1:2001 - CookieAuthentication 1 - ORPort 127.10.0.1:2002 - DirPort 127.10.0.1:2003 - Nickname auth1 - ContactInfo pastly(a)torproject.org - +DataDirectory auth1 +PidFile auth1/tor.pid +Log notice file auth1/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 +Address 127.10.0.1 +SocksPort 127.10.0.1:2000 +ControlPort 127.10.0.1:2001 +CookieAuthentication 1 +ORPort 127.10.0.1:2002 +DirPort 127.10.0.1:2003 +Nickname auth1 +ContactInfo pastly(a)torproject.org + + +TestingV3AuthInitialVotingInterval 5 +V3AuthVotingInterval 10 +TestingV3AuthInitialVoteDelay 2 +V3AuthVoteDelay 2 +TestingV3AuthInitialDistDelay 2 +V3AuthDistDelay 2 - TestingV3AuthInitialVotingInterval 5 - V3AuthVotingInterval 10 - TestingV3AuthInitialVoteDelay 2 - V3AuthVoteDelay 2 - TestingV3AuthInitialDistDelay 2 - V3AuthDistDelay 2 - DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 - +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/auth2/torrc b/tests/integration/net/auth2/torrc index 7e941ae..f3529e3 100644 --- a/tests/integration/net/auth2/torrc +++ b/tests/integration/net/auth2/torrc @@ -1,34 +1,33 @@ - DataDirectory auth2 - PidFile auth2/tor.pid - Log notice file auth2/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - AuthoritativeDirectory 1 - V3AuthoritativeDirectory 1 - Address 127.10.0.2 - SocksPort 127.10.0.2:2000 - ControlPort 127.10.0.2:2001 - CookieAuthentication 1 - ORPort 127.10.0.2:2002 - DirPort 127.10.0.2:2003 - Nickname auth2 - ContactInfo pastly(a)torproject.org - +DataDirectory auth2 +PidFile auth2/tor.pid +Log notice file auth2/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 +Address 127.10.0.2 +SocksPort 127.10.0.2:2000 +ControlPort 127.10.0.2:2001 +CookieAuthentication 1 +ORPort 127.10.0.2:2002 +DirPort 127.10.0.2:2003 +Nickname auth2 +ContactInfo pastly(a)torproject.org + + +TestingV3AuthInitialVotingInterval 5 +V3AuthVotingInterval 10 +TestingV3AuthInitialVoteDelay 2 +V3AuthVoteDelay 2 +TestingV3AuthInitialDistDelay 2 +V3AuthDistDelay 2 - TestingV3AuthInitialVotingInterval 5 - V3AuthVotingInterval 10 - TestingV3AuthInitialVoteDelay 2 - V3AuthVoteDelay 2 - TestingV3AuthInitialDistDelay 2 - V3AuthDistDelay 2 - DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 - +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/auth3/torrc b/tests/integration/net/auth3/torrc index 2ee6c60..70ddf2e 100644 --- a/tests/integration/net/auth3/torrc +++ b/tests/integration/net/auth3/torrc @@ -1,34 +1,33 @@ - DataDirectory auth3 - PidFile auth3/tor.pid - Log notice file auth3/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - AuthoritativeDirectory 1 - V3AuthoritativeDirectory 1 - Address 127.10.0.3 - SocksPort 127.10.0.3:2000 - ControlPort 127.10.0.3:2001 - CookieAuthentication 1 - ORPort 127.10.0.3:2002 - DirPort 127.10.0.3:2003 - Nickname auth3 - ContactInfo pastly(a)torproject.org - +DataDirectory auth3 +PidFile auth3/tor.pid +Log notice file auth3/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 +Address 127.10.0.3 +SocksPort 127.10.0.3:2000 +ControlPort 127.10.0.3:2001 +CookieAuthentication 1 +ORPort 127.10.0.3:2002 +DirPort 127.10.0.3:2003 +Nickname auth3 +ContactInfo pastly(a)torproject.org - TestingV3AuthInitialVotingInterval 5 - V3AuthVotingInterval 10 - TestingV3AuthInitialVoteDelay 2 - V3AuthVoteDelay 2 - TestingV3AuthInitialDistDelay 2 - V3AuthDistDelay 2 + +TestingV3AuthInitialVotingInterval 5 +V3AuthVotingInterval 10 +TestingV3AuthInitialVoteDelay 2 +V3AuthVoteDelay 2 +TestingV3AuthInitialDistDelay 2 +V3AuthDistDelay 2 DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 - +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/exit1/torrc b/tests/integration/net/exit1/torrc index 89ba9bf..10b22bd 100644 --- a/tests/integration/net/exit1/torrc +++ b/tests/integration/net/exit1/torrc @@ -1,26 +1,26 @@ - DataDirectory exit1 - PidFile exit1/tor.pid - Log notice file exit1/notice.log - ShutdownWaitLength 2 - ExitRelay 1 - IPv6Exit 1 - ExitPolicy accept *:* - ExitPolicy reject *:* - Address 127.10.0.11 - SocksPort 127.10.0.11:2000 - ControlPort 127.10.0.11:2001 - CookieAuthentication 1 - ORPort 127.10.0.11:2002 - DirPort 127.10.0.11:2003 - Nickname exit1 - ContactInfo pastly(a)torproject.org +DataDirectory exit1 +PidFile exit1/tor.pid +Log notice file exit1/notice.log +ShutdownWaitLength 2 +ExitRelay 1 +IPv6Exit 1 +ExitPolicy accept *:* +ExitPolicy reject *:* +Address 127.10.0.11 +SocksPort 127.10.0.11:2000 +ControlPort 127.10.0.11:2001 +CookieAuthentication 1 +ORPort 127.10.0.11:2002 +DirPort 127.10.0.11:2003 +Nickname exit1 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/exit2/torrc b/tests/integration/net/exit2/torrc index c4c4708..244b632 100644 --- a/tests/integration/net/exit2/torrc +++ b/tests/integration/net/exit2/torrc @@ -1,26 +1,26 @@ - DataDirectory exit2 - PidFile exit2/tor.pid - Log notice file exit2/notice.log - ShutdownWaitLength 2 - ExitRelay 1 - IPv6Exit 1 - ExitPolicy accept *:* - ExitPolicy reject *:* - Address 127.10.0.12 - SocksPort 127.10.0.12:2000 - ControlPort 127.10.0.12:2001 - CookieAuthentication 1 - ORPort 127.10.0.12:2002 - DirPort 127.10.0.12:2003 - Nickname exit2 - ContactInfo pastly(a)torproject.org +DataDirectory exit2 +PidFile exit2/tor.pid +Log notice file exit2/notice.log +ShutdownWaitLength 2 +ExitRelay 1 +IPv6Exit 1 +ExitPolicy accept *:* +ExitPolicy reject *:* +Address 127.10.0.12 +SocksPort 127.10.0.12:2000 +ControlPort 127.10.0.12:2001 +CookieAuthentication 1 +ORPort 127.10.0.12:2002 +DirPort 127.10.0.12:2003 +Nickname exit2 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/exit3/torrc b/tests/integration/net/exit3/torrc index 622ef54..ddfbcfe 100644 --- a/tests/integration/net/exit3/torrc +++ b/tests/integration/net/exit3/torrc @@ -1,26 +1,26 @@ - DataDirectory exit3 - PidFile exit3/tor.pid - Log notice file exit3/notice.log - ShutdownWaitLength 2 - ExitRelay 1 - IPv6Exit 1 - ExitPolicy accept *:* - ExitPolicy reject *:* - Address 127.10.0.13 - SocksPort 127.10.0.13:2000 - ControlPort 127.10.0.13:2001 - CookieAuthentication 1 - ORPort 127.10.0.13:2002 - DirPort 127.10.0.13:2003 - Nickname exit3 - ContactInfo pastly(a)torproject.org +DataDirectory exit3 +PidFile exit3/tor.pid +Log notice file exit3/notice.log +ShutdownWaitLength 2 +ExitRelay 1 +IPv6Exit 1 +ExitPolicy accept *:* +ExitPolicy reject *:* +Address 127.10.0.13 +SocksPort 127.10.0.13:2000 +ControlPort 127.10.0.13:2001 +CookieAuthentication 1 +ORPort 127.10.0.13:2002 +DirPort 127.10.0.13:2003 +Nickname exit3 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay1/torrc b/tests/integration/net/relay1/torrc index 0a5ef3b..bde5f91 100644 --- a/tests/integration/net/relay1/torrc +++ b/tests/integration/net/relay1/torrc @@ -1,23 +1,23 @@ - DataDirectory relay1 - PidFile relay1/tor.pid - Log notice file relay1/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.4 - SocksPort 127.10.0.4:2000 - ControlPort 127.10.0.4:2001 - CookieAuthentication 1 - ORPort 127.10.0.4:2002 - DirPort 127.10.0.4:2003 - Nickname relay1 - ContactInfo pastly(a)torproject.org +DataDirectory relay1 +PidFile relay1/tor.pid +Log notice file relay1/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.4 +SocksPort 127.10.0.4:2000 +ControlPort 127.10.0.4:2001 +CookieAuthentication 1 +ORPort 127.10.0.4:2002 +DirPort 127.10.0.4:2003 +Nickname relay1 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay1mbyteMAB/torrc b/tests/integration/net/relay1mbyteMAB/torrc index 192a48f..ed45e10 100644 --- a/tests/integration/net/relay1mbyteMAB/torrc +++ b/tests/integration/net/relay1mbyteMAB/torrc @@ -1,25 +1,25 @@ - DataDirectory relay1mbyteMAB - PidFile relay1mbyteMAB/tor.pid - Log notice file relay1mbyteMAB/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.14 - SocksPort 127.10.0.14:2000 - ControlPort 127.10.0.14:2001 - CookieAuthentication 1 - ORPort 127.10.0.14:2002 - DirPort 127.10.0.14:2003 - Nickname relay1mbyteMAB - ContactInfo pastly(a)torproject.org +DataDirectory relay1mbyteMAB +PidFile relay1mbyteMAB/tor.pid +Log notice file relay1mbyteMAB/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.14 +SocksPort 127.10.0.14:2000 +ControlPort 127.10.0.14:2001 +CookieAuthentication 1 +ORPort 127.10.0.14:2002 +DirPort 127.10.0.14:2003 +Nickname relay1mbyteMAB +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 MaxAdvertisedBandwidth 1 MByte diff --git a/tests/integration/net/relay1mbyteRBR/torrc b/tests/integration/net/relay1mbyteRBR/torrc index 4f345e6..bf27cc0 100644 --- a/tests/integration/net/relay1mbyteRBR/torrc +++ b/tests/integration/net/relay1mbyteRBR/torrc @@ -1,25 +1,25 @@ - DataDirectory relay1mbyteRBR - PidFile relay1mbyteRBR/tor.pid - Log notice file relay1mbyteRBR/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.15 - SocksPort 127.10.0.15:2000 - ControlPort 127.10.0.15:2001 - CookieAuthentication 1 - ORPort 127.10.0.15:2002 - DirPort 127.10.0.15:2003 - Nickname relay1mbyteRBR - ContactInfo pastly(a)torproject.org +DataDirectory relay1mbyteRBR +PidFile relay1mbyteRBR/tor.pid +Log notice file relay1mbyteRBR/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.15 +SocksPort 127.10.0.15:2000 +ControlPort 127.10.0.15:2001 +CookieAuthentication 1 +ORPort 127.10.0.15:2002 +DirPort 127.10.0.15:2003 +Nickname relay1mbyteRBR +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 RelayBandwidthRate 1 MByte diff --git a/tests/integration/net/relay2/torrc b/tests/integration/net/relay2/torrc index bc333ec..a3d49f1 100644 --- a/tests/integration/net/relay2/torrc +++ b/tests/integration/net/relay2/torrc @@ -1,23 +1,23 @@ - DataDirectory relay2 - PidFile relay2/tor.pid - Log notice file relay2/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.5 - SocksPort 127.10.0.5:2000 - ControlPort 127.10.0.5:2001 - CookieAuthentication 1 - ORPort 127.10.0.5:2002 - DirPort 127.10.0.5:2003 - Nickname relay2 - ContactInfo pastly(a)torproject.org +DataDirectory relay2 +PidFile relay2/tor.pid +Log notice file relay2/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.5 +SocksPort 127.10.0.5:2000 +ControlPort 127.10.0.5:2001 +CookieAuthentication 1 +ORPort 127.10.0.5:2002 +DirPort 127.10.0.5:2003 +Nickname relay2 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay3/torrc b/tests/integration/net/relay3/torrc index 29526a4..04d6a9f 100644 --- a/tests/integration/net/relay3/torrc +++ b/tests/integration/net/relay3/torrc @@ -1,23 +1,23 @@ - DataDirectory relay3 - PidFile relay3/tor.pid - Log notice file relay3/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.6 - SocksPort 127.10.0.6:2000 - ControlPort 127.10.0.6:2001 - CookieAuthentication 1 - ORPort 127.10.0.6:2002 - DirPort 127.10.0.6:2003 - Nickname relay3 - ContactInfo pastly(a)torproject.org +DataDirectory relay3 +PidFile relay3/tor.pid +Log notice file relay3/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.6 +SocksPort 127.10.0.6:2000 +ControlPort 127.10.0.6:2001 +CookieAuthentication 1 +ORPort 127.10.0.6:2002 +DirPort 127.10.0.6:2003 +Nickname relay3 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay4/torrc b/tests/integration/net/relay4/torrc index 8444566..8d7ffa2 100644 --- a/tests/integration/net/relay4/torrc +++ b/tests/integration/net/relay4/torrc @@ -1,23 +1,23 @@ - DataDirectory relay4 - PidFile relay4/tor.pid - Log notice file relay4/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.7 - SocksPort 127.10.0.7:2000 - ControlPort 127.10.0.7:2001 - CookieAuthentication 1 - ORPort 127.10.0.7:2002 - DirPort 127.10.0.7:2003 - Nickname relay4 - ContactInfo pastly(a)torproject.org +DataDirectory relay4 +PidFile relay4/tor.pid +Log notice file relay4/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.7 +SocksPort 127.10.0.7:2000 +ControlPort 127.10.0.7:2001 +CookieAuthentication 1 +ORPort 127.10.0.7:2002 +DirPort 127.10.0.7:2003 +Nickname relay4 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay5/torrc b/tests/integration/net/relay5/torrc index 894be6a..82d995d 100644 --- a/tests/integration/net/relay5/torrc +++ b/tests/integration/net/relay5/torrc @@ -1,23 +1,23 @@ - DataDirectory relay5 - PidFile relay5/tor.pid - Log notice file relay5/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.8 - SocksPort 127.10.0.8:2000 - ControlPort 127.10.0.8:2001 - CookieAuthentication 1 - ORPort 127.10.0.8:2002 - DirPort 127.10.0.8:2003 - Nickname relay5 - ContactInfo pastly(a)torproject.org +DataDirectory relay5 +PidFile relay5/tor.pid +Log notice file relay5/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.8 +SocksPort 127.10.0.8:2000 +ControlPort 127.10.0.8:2001 +CookieAuthentication 1 +ORPort 127.10.0.8:2002 +DirPort 127.10.0.8:2003 +Nickname relay5 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay6/torrc b/tests/integration/net/relay6/torrc index a86d48c..f33d71a 100644 --- a/tests/integration/net/relay6/torrc +++ b/tests/integration/net/relay6/torrc @@ -1,23 +1,23 @@ - DataDirectory relay6 - PidFile relay6/tor.pid - Log notice file relay6/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.9 - SocksPort 127.10.0.9:2000 - ControlPort 127.10.0.9:2001 - CookieAuthentication 1 - ORPort 127.10.0.9:2002 - DirPort 127.10.0.9:2003 - Nickname relay6 - ContactInfo pastly(a)torproject.org +DataDirectory relay6 +PidFile relay6/tor.pid +Log notice file relay6/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.9 +SocksPort 127.10.0.9:2000 +ControlPort 127.10.0.9:2001 +CookieAuthentication 1 +ORPort 127.10.0.9:2002 +DirPort 127.10.0.9:2003 +Nickname relay6 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay7/torrc b/tests/integration/net/relay7/torrc index 12d8609..d7a4842 100644 --- a/tests/integration/net/relay7/torrc +++ b/tests/integration/net/relay7/torrc @@ -1,23 +1,23 @@ - DataDirectory relay7 - PidFile relay7/tor.pid - Log notice file relay7/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.10 - SocksPort 127.10.0.10:2000 - ControlPort 127.10.0.10:2001 - CookieAuthentication 1 - ORPort 127.10.0.10:2002 - DirPort 127.10.0.10:2003 - Nickname relay7 - ContactInfo pastly(a)torproject.org +DataDirectory relay7 +PidFile relay7/tor.pid +Log notice file relay7/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.10 +SocksPort 127.10.0.10:2000 +ControlPort 127.10.0.10:2001 +CookieAuthentication 1 +ORPort 127.10.0.10:2002 +DirPort 127.10.0.10:2003 +Nickname relay7 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0

1 0

[sbws/maint-1.1] Merge branch 'maint-1.1_bug34394' into 'maint-1.1'
by juga＠torproject.org 06 Jul '20

06 Jul '20

commit 3e86fd598c400c4934d105ff8f3c1c5895b2d55b Merge: 02861e1 a8c91d0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jul 5 19:34:22 2020 +0000 Merge branch 'maint-1.1_bug34394' into 'maint-1.1' fix: tests: Create new authority keys Closes #33150 and #34394 See merge request tpo/network-health/sbws!10 tests/integration/conftest.py | 6 +- .../net/auth1/keys/authority_certificate | 65 +++++++++--------- .../net/auth1/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth1/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth1/torrc | 61 +++++++++-------- .../net/auth2/keys/authority_certificate | 65 +++++++++--------- .../net/auth2/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth2/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth2/torrc | 61 +++++++++-------- .../net/auth3/keys/authority_certificate | 65 +++++++++--------- .../net/auth3/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth3/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth3/torrc | 61 +++++++++-------- tests/integration/net/exit1/torrc | 49 +++++++------- tests/integration/net/exit2/torrc | 49 +++++++------- tests/integration/net/exit3/torrc | 49 +++++++------- tests/integration/net/relay1/torrc | 43 ++++++------ tests/integration/net/relay1mbyteMAB/torrc | 44 ++++++------ tests/integration/net/relay1mbyteRBR/torrc | 44 ++++++------ tests/integration/net/relay2/torrc | 43 ++++++------ tests/integration/net/relay3/torrc | 43 ++++++------ tests/integration/net/relay4/torrc | 43 ++++++------ tests/integration/net/relay5/torrc | 43 ++++++------ tests/integration/net/relay6/torrc | 43 ++++++------ tests/integration/net/relay7/torrc | 43 ++++++------ tests/integration/sbws_testnet.ini | 8 +-- 26 files changed, 648 insertions(+), 664 deletions(-)

1 0