date:20171107

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-11-07 Thread translation

commit f4c84ffa7009d3164c8a0a30b4bb08e8d2318775
Author: Translation commit bot 
Date:   Tue Nov 7 09:22:13 2017 +

Update translations for tor-browser-manual
---
 it/it.po | 39 +++
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/it/it.po b/it/it.po
index a1b36eb8f..19f5a8864 100644
--- a/it/it.po
+++ b/it/it.po
@@ -11,16 +11,16 @@
 # Him-Calan Je Distros , 2016
 # Alessandro Toffalini , 2016
 # Massimo Scacco , 2017
+# Paveway noname , 2017
 # Daniele , 2017
 # Giuseppe Pignataro (Fasbyte01) , 2017
 # s r , 2017
-# Paveway noname , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Paveway noname , 2017\n"
+"Last-Translator: s r , 2017\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -243,7 +243,7 @@ msgstr "Cosa fare se il network Tor Ã¨ bloccato"
 
 #: circumvention.page:10
 msgid "Circumvention"
-msgstr "circonvenzione"
+msgstr "Elusione"
 
 #: circumvention.page:12
 msgid ""
@@ -325,7 +325,7 @@ msgstr ""
 
 #: circumvention.page:60
 msgid "Which transport should I use?"
-msgstr ""
+msgstr "Che trasporto dovrei utilizzare?"
 
 #: circumvention.page:61
 msgid ""
@@ -334,6 +334,10 @@ msgid ""
 "Transports page), and their effectiveness depends on your individual "
 "circumstances."
 msgstr ""
+"Ciasacun trasporto riportato nel menu principale di Tor funziona in maniera "
+"differente ( per maggiori dettagli controlla la pagina Pluggable transports) e la loro efficacia dipende"
+" dalle diverse circostanze"
 
 #: circumvention.page:67
 msgid ""
@@ -341,6 +345,9 @@ msgid ""
 " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-"
 "azure, meek-amazon."
 msgstr ""
+"Se state provando ad eludere una connessione bloccata per la prima volta "
+"dovrete provare differenti trasporti : obfs3, obfs4, ScrambleSuit, fte, "
+"meek-azure, meek-amazon."
 
 #: circumvention.page:72
 msgid ""
@@ -349,6 +356,10 @@ msgid ""
 "xref=\"bridges\">Bridges section to learn what bridges are and how to"
 " obtain them."
 msgstr ""
+"Nel caso abbiate provato ad utilizzare tutti questi trasporti e nessuno di "
+"essi vi riesce a portare online dovrete inserire l'indirizzo del ponte "
+"manualmente. Leggete la sezione Pontiper "
+"imparare cosa sono i ponti e come ottenerli"
 
 #: downloading.page:7
 msgid "How to download Tor Browser"
@@ -569,6 +580,12 @@ msgid ""
 "xref=\"circumvention\">Circumvention screen to configure a pluggable "
 "transport."
 msgstr ""
+"La prima schermata vi chiederÃ  se l'accesso alla rete Tor Ã¨ bloccata o "
+"censurata sulla vostra linea. Se pensate che non sia il vostro caso cliccate"
+" su \"No\". Se non sapete se la vostra rete Ã¨ censurata o avete provato a "
+"connettervi alla rete Tor senza successo e nessun altra soluzione ha "
+"funzionato cliccate su \"Si\". Sarete portati allo schermata di Elusioneper configurare a pluggable transport"
 
 #: first-time.page:55
 msgid ""
@@ -578,6 +595,12 @@ msgid ""
 "ask your network administrator for guidance. If your connection does not use"
 " a proxy, click âContinueâ."
 msgstr ""
+"La schermata seguente vi domanderÃ  se la vostra connessione utilizza un "
+"proxy. Nella maggior parte dei casi questo non Ã¨ necessario. Voi saprete di "
+"sicuro se rispondere \"Si\", in quanto sono gli stessi parametri utilizzati "
+"dagli altri browser internet sul vostro sistema. Se possibile, contattate il"
+" vostro amministratore di sistema per informazioni. Se la vostra connessione"
+" non usa proxy cliccate \"Continua\""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -589,6 +612,8 @@ msgid ""
 "external ref='media/first-time/proxy_question.png' "
 "md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
+"link esterno ref='media/first-time/proxy_question.png' "
+"md5='30853b3e86cfd386bbc32e5b8b45a378'"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -600,6 +625,8 @@ msgid ""
 "external ref='media/first-time/proxy.png' "
 "md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
+"link esterno ref='media/first-time/proxy.png' "
+"md5='13f21a351cd0aa1cf11aada690f3dc90'"
 
 #: index.page:6
 msgid "Tor Browser User Manual"
@@ -692,6 +719,8 @@ msgstr ""
 #: managing-identities.page:6
 msgid "Learn how to control personally-identifying information in Tor Browser"
 msgstr ""
+"Impara come controllare le

[tor-commits] [translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed

2017-11-07 Thread translation

commit 2472e5f72dbb45743e976d98a475af78f3304747
Author: Translation commit bot 
Date:   Tue Nov 7 22:48:06 2017 +

Update translations for tails-perl5lib_completed
---
 nl.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl.po b/nl.po
index 2b919011c..e66d018d3 100644
--- a/nl.po
+++ b/nl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-20 10:59+0200\n"
-"PO-Revision-Date: 2017-11-06 14:34+\n"
+"PO-Revision-Date: 2017-11-07 22:19+\n"
 "Last-Translator: Joren Vandeweyer \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib

2017-11-07 Thread translation

commit ccaf6be54ef96a26482b68e135668af8aa5d17ef
Author: Translation commit bot 
Date:   Tue Nov 7 22:48:01 2017 +

Update translations for tails-perl5lib
---
 nl.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl.po b/nl.po
index 2b919011c..e66d018d3 100644
--- a/nl.po
+++ b/nl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-20 10:59+0200\n"
-"PO-Revision-Date: 2017-11-06 14:34+\n"
+"PO-Revision-Date: 2017-11-07 22:19+\n"
 "Last-Translator: Joren Vandeweyer \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed

2017-11-07 Thread translation

commit 7dbe8e68771d61787b461fa29eb7510fcabd432b
Author: Translation commit bot 
Date:   Tue Nov 7 23:18:56 2017 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 nl/abouttbupdate.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nl/abouttbupdate.dtd b/nl/abouttbupdate.dtd
index e773a683d..3fc2ec2bd 100644
--- a/nl/abouttbupdate.dtd
+++ b/nl/abouttbupdate.dtd
@@ -1,6 +1,6 @@
-
-
-
-
+
+
+
+
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2017-11-07 Thread translation

commit 656d0b9935d071727808221d61a402c9da83c8e0
Author: Translation commit bot 
Date:   Tue Nov 7 23:18:51 2017 +

Update translations for torbutton-abouttbupdatedtd
---
 nl/abouttbupdate.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nl/abouttbupdate.dtd b/nl/abouttbupdate.dtd
index e773a683d..3fc2ec2bd 100644
--- a/nl/abouttbupdate.dtd
+++ b/nl/abouttbupdate.dtd
@@ -1,6 +1,6 @@
-
-
-
-
+
+
+
+
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sandboxed-tor-browser/master] Bug 24171: Create the `Caches` directory properly.

2017-11-07 Thread yawning

commit 4feaed188124f94458aec2da05893196bc5767c4
Author: Yawning Angel 
Date:   Wed Nov 8 05:01:50 2017 +

Bug 24171: Create the `Caches` directory properly.
---
 ChangeLog | 1 +
 src/cmd/sandboxed-tor-browser/internal/sandbox/application.go | 4 
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1471ea2..92c0182 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Changes in version 0.0.16 - UNRELEASED:
+ * Bug 24171: Create the `Caches` directory properly.
 
 Changes in version 0.0.15 - 2017-10-30:
  * Bug 23915: 7.0.7 and later fails to work without 
`SECCOMP_FILTER_FLAG_TSYNC`.
diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go 
b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go
index d29df34..9d68516 100644
--- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go
+++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go
@@ -102,12 +102,16 @@ func RunTorBrowser(cfg *config.Config, manif 
*config.Manifest, tor *tor.Tor) (pr
 
browserHome := filepath.Join(h.homeDir, "sandboxed-tor-browser", 
"tor-browser", "Browser")
realBrowserHome := filepath.Join(cfg.BundleInstallDir, "Browser")
+   realCachesDir := filepath.Join(realBrowserHome, cachesSubDir)
realProfileDir := filepath.Join(realBrowserHome, profileSubDir)
realDesktopDir := filepath.Join(realBrowserHome, "Desktop")
realDownloadsDir := filepath.Join(realBrowserHome, "Downloads")
realExtensionsDir := filepath.Join(realProfileDir, "extensions")
 
// Ensure that the `Caches`, `Downloads` and `Desktop` mount points 
exist.
+   if err = os.MkdirAll(realCachesDir, DirMode); err != nil {
+   return
+   }
if err = os.MkdirAll(realDesktopDir, DirMode); err != nil {
return
}

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-52.4.1esr-7.0-1] Bug 24052: Streamline handling of file:// resources

2017-11-07 Thread gk

commit c5d1bb91512f9dd20e0f54c6f3e6979588cf9f56
Author: Georg Koppen 
Date:   Fri Oct 27 20:40:57 2017 +

Bug 24052: Streamline handling of file:// resources

We should make sure restrictions regarding loading of file:// resources
are adhered to more strictly, at least on *nix platforms.

This is a workaround for
https://bugzilla.mozilla.org/show_bug.cgi?id=1412081.
---
 netwerk/base/nsIOService.cpp| 8 
 netwerk/protocol/file/nsFileProtocolHandler.cpp | 7 +++
 2 files changed, 15 insertions(+)

diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
index 0da79c18ae41..0cc67da7b18f 100644
--- a/netwerk/base/nsIOService.cpp
+++ b/netwerk/base/nsIOService.cpp
@@ -789,12 +789,20 @@ 
nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI,
 // if calling newChannel2() fails we try to fall back to
 // creating a new channel by calling NewChannel().
 if (NS_FAILED(rv)) {
+#ifdef XP_UNIX
+if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) {
+return rv;
+} else {
+#endif
 rv = handler->NewChannel(aURI, getter_AddRefs(channel));
 NS_ENSURE_SUCCESS(rv, rv);
 // The protocol handler does not implement NewChannel2, so
 // maybe we need to wrap the channel (see comment in MaybeWrap
 // function).
 channel = nsSecCheckWrapChannel::MaybeWrap(channel, aLoadInfo);
+#ifdef XP_UNIX
+}
+#endif
 }
 }
 
diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp 
b/netwerk/protocol/file/nsFileProtocolHandler.cpp
index e55cb9d47460..c24c928b6f02 100644
--- a/netwerk/protocol/file/nsFileProtocolHandler.cpp
+++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp
@@ -188,6 +188,13 @@ nsFileProtocolHandler::NewChannel2(nsIURI* uri,
nsILoadInfo* aLoadInfo,
nsIChannel** result)
 {
+#ifdef XP_UNIX
+if (aLoadInfo && aLoadInfo->TriggeringPrincipal()) {
+  if (aLoadInfo->TriggeringPrincipal()->GetIsCodebasePrincipal()) {
+return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST;
+  }
+}
+#endif
 nsFileChannel *chan = new nsFileChannel(uri);
 if (!chan)
 return NS_ERROR_OUT_OF_MEMORY;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-52.4.1esr-7.0-1] Bug 24052: Handle redirects by blocking them early

2017-11-07 Thread gk

commit e2c1240ad25f4edcc7d3828b29f6aeb953a24a2e
Author: Arthur Edelstein 
Date:   Wed Nov 1 02:33:18 2017 -0700

Bug 24052: Handle redirects by blocking them early

This is the second part of the workaround for
https://bugzilla.mozilla.org/show_bug.cgi?id=1412081.
---
 netwerk/protocol/http/nsHttpChannel.cpp | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/netwerk/protocol/http/nsHttpChannel.cpp 
b/netwerk/protocol/http/nsHttpChannel.cpp
index 0e570e8cb57d..b38be48bf0c9 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -5419,6 +5419,13 @@ nsHttpChannel::AsyncProcessRedirection(uint32_t 
redirectType)
 return NS_ERROR_CORRUPTED_CONTENT;
 }
 
+bool isRedirectToFile = false;
+rv = mRedirectURI->SchemeIs("file", );
+if (!NS_FAILED(rv) && isRedirectToFile) {
+LOG(("Attempted to redirect from a remote page to a file:// URI."));
+return NS_ERROR_FAILURE;
+}
+
 if (mApplicationCache) {
 // if we are redirected to a different origin check if there is a 
fallback
 // cache entry to fall back to. we don't care about file strict

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-11-07 Thread translation

commit 44f45d073d8d50c77f605b3f0b9dff5b7c7a17f4
Author: Translation commit bot 
Date:   Tue Nov 7 10:20:44 2017 +

Update translations for tor-browser-manual
---
 it/it.po | 18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/it/it.po b/it/it.po
index fe1e863ed..6b98cb38e 100644
--- a/it/it.po
+++ b/it/it.po
@@ -911,6 +911,8 @@ msgid ""
 "An onion servicesâs location and IP address are hidden, making it difficult 
"
 "for adversaries to censor it or identify its operators."
 msgstr ""
+"La localizzazione e l'indirizzo IP di un servizio Onion sono nascosti, "
+"questo rende ne difficile la censura e l'identificazione degli utilizzatori"
 
 #: onionsites.page:29
 msgid ""
@@ -1133,7 +1135,7 @@ msgstr ""
 
 #: secure-connections.page:62
 msgid "Potentially visible data"
-msgstr ""
+msgstr "Dati potenzialmente visibili"
 
 #: secure-connections.page:70
 msgid "The site being visited."
@@ -1141,7 +1143,7 @@ msgstr ""
 
 #: secure-connections.page:81
 msgid "Username and password used for authentication."
-msgstr ""
+msgstr "Username a password utilizzate per l'autenticazione"
 
 #: secure-connections.page:92
 msgid "Data being transmitted."
@@ -1159,11 +1161,11 @@ msgstr ""
 
 #: security-slider.page:6
 msgid "Configuring Tor Browser for security and usability"
-msgstr ""
+msgstr "Configurate il browser Tor per la sicurezza e l'usabilitÃ "
 
 #: security-slider.page:10
 msgid "Security Slider"
-msgstr ""
+msgstr "Tab di Sicurezza"
 
 #: security-slider.page:11
 msgid ""
@@ -1173,10 +1175,16 @@ msgid ""
 "some web pages from functioning properly, so you should weigh your security "
 "needs against the degree of usability you require."
 msgstr ""
+"Il browser Tor include una \"Tab di Sicurezza\" che permette di  "
+"disabilitare alcune caratteristiche web che potrebbero essere utilizzate per"
+" attaccare la vostra sicurezza e anonimato. Aumentando il livello di "
+"sicurezza del browser Tor alcune pagine potrebbero non funzionare "
+"correttamente; per questo motivo dovrete scegliere tra il vostro bisogno di "
+"sicurezza e l'usabilitÃ  della pagina di cui avete bisogno"
 
 #: security-slider.page:21
 msgid "Accessing the Security Slider"
-msgstr "Accesso alle opzioni di sicurezza"
+msgstr "Accesso alla Tab di Sicurezza"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2017-11-07 Thread translation

commit a395853919e11292dc7e66df7fa71d92787ea6ad
Author: Translation commit bot 
Date:   Tue Nov 7 10:50:30 2017 +

Update translations for tails-greeter-2
---
 ar/ar.po | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 8d5df11c6..8c6b8fa2c 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:1
 msgid "Administration Password"
-msgstr ""
+msgstr "ÙÙÙØ© Ø³Ø± Ø§Ø¯Ø§Ø±ÙÙØ©"
 
 #: ../data/greeter.ui.h:2
 msgid ""
@@ -28,10 +28,12 @@ msgid ""
 "tasks. Otherwise, the administration password is disabled for better "
 "security."
 msgstr ""
+"ÙÙ Ø¨Ø¥Ø¹Ø¯Ø§Ø¯ ÙÙÙØ© Ø³Ø±Ù Ø¥Ø¯Ø§Ø±ÙÙØ© Ø¥Ø°Ø§ Ø§Ø±Ø¯Øª Ø§ÙÙÙØ§Ù 
Ø¨ÙÙÙÙØ§Øª Ø¥Ø¯Ø§Ø±ÙÙØ© , Ø¹Ø¯Ø§ Ø°ÙÙ , Ø³ØªÙÙÙ"
+" ÙÙÙØ© Ø§ÙØ³Ø±Ù Ø§ÙØ¥Ø¯Ø§Ø±ÙÙØ© ÙØ¹Ø·ÙÙØ© ÙØÙØ§ÙØ© Ø§ÙØ¶Ù."
 
 #: ../data/greeter.ui.h:3
 msgid "Enter an administration password"
-msgstr ""
+msgstr "ÙÙ Ø¨Ø§Ø¯Ø®Ø§Ù ÙÙÙØ© Ø³Ø± Ø¥Ø¯Ø§Ø±ÙÙØ©"
 
 #: ../data/greeter.ui.h:4
 msgid "Confirm"
@@ -39,7 +41,7 @@ msgstr "ØªØ£ÙÙØ¯ "
 
 #: ../data/greeter.ui.h:5
 msgid "Confirm your administration password"
-msgstr ""
+msgstr "Ø£ÙÙØ¯ ÙÙÙØ© Ø§ÙØ³Ø±Ù Ø§ÙØ¥Ø¯Ø§Ø±ÙÙØ© Ø§ÙØ®Ø§ØµÙØ© Ø¨Ù "
 
 #: ../data/greeter.ui.h:6
 msgid "Disable"
@@ -60,7 +62,7 @@ msgstr ""
 #. This string will never be displayed in the 1st version of the greeter.
 #: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
-msgstr ""
+msgstr "ØªÙÙÙÙ ÙØ¸Ø§Ù ØªØ´ØºÙÙ Microsoft Windows 10"
 
 #: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2017-11-07 Thread translation

commit fc4eda1706779ab71f70960ef63dcc9da533f0ed
Author: Translation commit bot 
Date:   Tue Nov 7 10:16:05 2017 +

Update translations for tails-persistence-setup
---
 et/et.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/et/et.po b/et/et.po
index 033ed7e13..c68654278 100644
--- a/et/et.po
+++ b/et/et.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2017-09-19 18:52+\n"
+"PO-Revision-Date: 2017-11-07 10:16+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Estonian 
(http://www.transifex.com/otf/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2017-11-07 Thread translation

commit 941f418ef4aa77b08a214fb7e2057a6cc9a8bdcb
Author: Translation commit bot 
Date:   Tue Nov 7 10:46:42 2017 +

Update translations for tor-launcher-properties
---
 et/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/et/torlauncher.properties b/et/torlauncher.properties
index 57528a502..8b4033069 100644
--- a/et/torlauncher.properties
+++ b/et/torlauncher.properties
@@ -33,7 +33,7 @@ torlauncher.recommended_bridge=(soovitatud)
 torlauncher.connect=Connect
 torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
-torlauncher.quit_win=Exit
+torlauncher.quit_win=VÃ¤lju
 torlauncher.done=Valmis
 
 torlauncher.forAssistance=For assistance, contact %S

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2017-11-07 Thread translation

commit 6853612d728f8040583d282cf45691cb97eab004
Author: Translation commit bot 
Date:   Tue Nov 7 10:46:09 2017 +

Update translations for tails-persistence-setup
---
 ar/ar.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 6eecc6ae9..9625cf35b 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -10,6 +10,7 @@
 # alshara3 , 2013
 # alshara3 , 2013
 # lamine Kacimi , 2015
+# mohammad ali , 2017
 # Mohammed ALDOUB , 2013
 # Sherief Alaa , 2013
 # Singapore Goldindor, 2016
@@ -18,8 +19,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2017-09-23 18:41+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-11-07 10:41+\n"
+"Last-Translator: mohammad ali \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +62,7 @@ msgstr "Ø§ÙØØ³Ø§Ø¨Ø§Øª Ø§ÙØ´Ø®ØµÙØ©  ÙÙ Pidgin Ù OTR 
keyring"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
 msgid "Thunderbird"
-msgstr ""
+msgstr "ØªØ·Ø¨ÙÙ Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
 msgid "Thunderbird profiles and locally stored email"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/whisperback] Update translations for whisperback

2017-11-07 Thread translation

commit b66fd348df368d7e6707cc13a4f2d90310ba4e17
Author: Translation commit bot 
Date:   Tue Nov 7 10:45:26 2017 +

Update translations for whisperback
---
 ar/ar.po | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 8e083a426..6d8bca919 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mohammad ali , 2017
 # Mohammed ALDOUB , 2012
 # Mohammed ALDOUB , 2012
 # Sherief Alaa , 2013
@@ -11,8 +12,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-09-23 16:20+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-11-07 10:38+\n"
+"Last-Translator: mohammad ali \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,19 +45,19 @@ msgstr "Ø§ÙÙØªØºÙØ± %s ØºÙØ± ÙÙØ¬ÙØ¯ ÙÙ Ø£Ù ÙÙ 
ÙÙÙØ§Øª Ø§ÙØ§Ø¹Ø¯
 
 #: ../whisperBack/gui.py:110
 msgid "Name of the affected software"
-msgstr ""
+msgstr "Ø§Ø³Ù Ø§ÙØ¨Ø±ÙØ§ÙØ¬ Ø§ÙÙØªØ£Ø«ÙØ±"
 
 #: ../whisperBack/gui.py:112
 msgid "Exact steps to reproduce the error"
-msgstr ""
+msgstr "Ø§ÙØ®Ø·ÙØ§Øª Ø§ÙØ¯ÙÙÙØ© ÙØ§Ø¹Ø§Ø¯Ø© ØªÙÙÙÙ Ø§ÙØ®Ø·Ø£"
 
 #: ../whisperBack/gui.py:114
 msgid "Actual result and description of the error"
-msgstr ""
+msgstr "Ø§ÙÙØªÙØ¬Ø© Ø§ÙØØ§ØµÙØ© ÙÙØµÙ Ø§ÙØ®Ø·Ø£"
 
 #: ../whisperBack/gui.py:116
 msgid "Desired result"
-msgstr ""
+msgstr "Ø§ÙÙØªÙØ¬Ø© Ø§ÙÙØ±ØºÙØ¨ Ø¨ÙØ§"
 
 #: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/whisperback_completed] Update translations for whisperback_completed

2017-11-07 Thread translation

commit 2c5c83a26dce0d317fc09ef5b17427b5dbad73cf
Author: Translation commit bot 
Date:   Tue Nov 7 10:45:33 2017 +

Update translations for whisperback_completed
---
 ar/ar.po | 61 +++--
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 2fc56f8ef..6d8bca919 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mohammad ali , 2017
 # Mohammed ALDOUB , 2012
 # Mohammed ALDOUB , 2012
 # Sherief Alaa , 2013
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 19:54+0100\n"
-"PO-Revision-Date: 2016-03-21 16:28+\n"
-"Last-Translator: Sherief Alaa \n"
+"POT-Creation-Date: 2017-03-20 12:09+\n"
+"PO-Revision-Date: 2017-11-07 10:38+\n"
+"Last-Translator: mohammad ali \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,40 +43,56 @@ msgid ""
 "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 msgstr "Ø§ÙÙØªØºÙØ± %s ØºÙØ± ÙÙØ¬ÙØ¯ ÙÙ Ø£Ù ÙÙ ÙÙÙØ§Øª 
Ø§ÙØ§Ø¹Ø¯Ø§Ø¯Ø§Øª  /etc/whisperback/config.py, ~/.whisperback/config.py, 
./config.py"
 
-#: ../whisperBack/gui.py:148
+#: ../whisperBack/gui.py:110
+msgid "Name of the affected software"
+msgstr "Ø§Ø³Ù Ø§ÙØ¨Ø±ÙØ§ÙØ¬ Ø§ÙÙØªØ£Ø«ÙØ±"
+
+#: ../whisperBack/gui.py:112
+msgid "Exact steps to reproduce the error"
+msgstr "Ø§ÙØ®Ø·ÙØ§Øª Ø§ÙØ¯ÙÙÙØ© ÙØ§Ø¹Ø§Ø¯Ø© ØªÙÙÙÙ Ø§ÙØ®Ø·Ø£"
+
+#: ../whisperBack/gui.py:114
+msgid "Actual result and description of the error"
+msgstr "Ø§ÙÙØªÙØ¬Ø© Ø§ÙØØ§ØµÙØ© ÙÙØµÙ Ø§ÙØ®Ø·Ø£"
+
+#: ../whisperBack/gui.py:116
+msgid "Desired result"
+msgstr "Ø§ÙÙØªÙØ¬Ø© Ø§ÙÙØ±ØºÙØ¨ Ø¨ÙØ§"
+
+#: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."
 msgstr "ØºÙØ± ÙØ§Ø¯Ø± Ø¹ÙÙ ØªØÙÙÙ ØªÙÙÙÙ ØµØ§ÙØ."
 
-#: ../whisperBack/gui.py:214
+#: ../whisperBack/gui.py:218
 msgid "Sending mail..."
 msgstr "Ø¬Ø§Ø±Ù Ø£Ø±Ø³Ø§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ..."
 
-#: ../whisperBack/gui.py:215
+#: ../whisperBack/gui.py:219
 msgid "Sending mail"
 msgstr "Ø¬Ø§Ø±Ù Ø£Ø±Ø³Ø§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:217
+#: ../whisperBack/gui.py:221
 msgid "This could take a while..."
 msgstr "ÙÙÙÙ Ø£Ù ÙØ³ØªØºØ±Ù ÙØ°Ø§ Ø¨Ø¹Ø¶ Ø§ÙÙÙØª..."
 
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:236
 msgid "The contact email adress doesn't seem valid."
 msgstr "Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ§ÙÙØªØ±ÙÙÙ ÙØ§ ÙØ¨Ø¯Ù ØµØÙØØ§Ù."
 
-#: ../whisperBack/gui.py:249
+#: ../whisperBack/gui.py:253
 msgid "Unable to send the mail: SMTP error."
 msgstr "ØºÙØ± ÙØ§Ø¯Ø± Ø¹ÙÙ Ø§Ø±Ø³Ø§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ: Ù
Ø´ÙÙØ© ÙÙ SMTP."
 
-#: ../whisperBack/gui.py:251
+#: ../whisperBack/gui.py:255
 msgid "Unable to connect to the server."
 msgstr "ØºÙØ± ÙØ§Ø¯Ø± Ø¹ÙÙ Ø§ÙØ§ØªØµØ§Ù Ø¨Ø§ÙØ®Ø§Ø¯Ù."
 
-#: ../whisperBack/gui.py:253
+#: ../whisperBack/gui.py:257
 msgid "Unable to create or to send the mail."
 msgstr "ØºÙØ± ÙØ§Ø¯Ø± Ø¹ÙÙ Ø§ÙØ´Ø§Ø¡ Ø§Ù Ø§Ø±Ø³Ø§Ù Ø¨Ø±ÙØ¯ 
Ø§ÙÙØªØ±ÙÙÙ"
 
-#: ../whisperBack/gui.py:256
+#: ../whisperBack/gui.py:260
 msgid ""
 "\n"
 "\n"
@@ -84,20 +101,20 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nÙÙ ÙØªÙ Ø§Ø±Ø³Ø§Ù ØªÙØ±ÙØ± Ø§ÙØ®Ø·Ø£Ø ÙØºØ§ÙØ¨Ø§ 
Ø¨Ø³Ø¨Ø¨ ÙØ´ÙÙØ© Ø¨Ø§ÙØ§ØªØµØ§Ù. ØªØ£ÙØ¯ ÙÙ Ø§ØªØµØ§ÙÙ Ù ÙØ±Ø± 
Ø§ÙÙØØ§ÙÙØ©.\n\nØ§Ø°Ø§ ÙÙ ØªØªÙÙÙ ÙÙ Ø§ÙØ§ØªØµØ§Ù ÙÙÙÙÙ 
ØÙØ¸ ØªÙØ±ÙØ± Ø§ÙØ®Ø·Ø£ ÙØ§Ø±Ø³Ø§ÙÙ ÙØ§ØÙØ§Ù."
 
-#: ../whisperBack/gui.py:269
+#: ../whisperBack/gui.py:273
 msgid "Your message has been sent."
 msgstr "ØªÙ Ø§Ø±Ø³Ø§Ù Ø±Ø³Ø§ÙØªÙ."
 
-#: ../whisperBack/gui.py:276
+#: ../whisperBack/gui.py:280
 msgid "An error occured during encryption."
 msgstr "ØØµÙ Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ Ø§ÙØªØ´ÙÙØ±"
 
-#: ../whisperBack/gui.py:296
+#: ../whisperBack/gui.py:300
 #, python-format
 msgid "Unable to save %s."
 msgstr "ØºÙØ± ÙØ§Ø¯Ø± Ø¹ÙÙ ØÙØ¸ %s."
 
-#: ../whisperBack/gui.py:319
+#: ../whisperBack/gui.py:323
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -107,27 +124,27 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "ÙÙ ÙØªÙÙÙ ÙÙ Ø§Ø±Ø³Ø§Ù ØªÙØ±ÙØ± Ø§ÙØ£Ø®Ø·Ø§Ø¡ ÙØ°ÙÙ 
ÙØ®Ø·Ø£ ÙÙ Ø§ÙØ§ØªØµØ§Ù.\n\nÙØÙ ÙØ¤ÙØª ÙÙÙÙÙ ØÙØ¸ 
Ø§ÙØªÙØ±ÙØ± Ø¹ÙÙ Ø°Ø§ÙØ±Ø© ÙÙØ§Ø´ Ù Ø§Ø±Ø³Ø§ÙÙØ§ ÙÙØ§ Ø¹ÙÙ %s Ù
Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ§ÙÙØªØ±ÙÙÙ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù Ø¬ÙØ§Ø² Ø¢Ø®Ø±. ÙÙ ÙØªÙ
 ØªØ³ÙÙÙ Ø§ÙØªÙØ±ÙØ± Ø¨ÙØ§ÙÙ

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-11-07 Thread translation

commit af3b0d03872c9883ef892b29ef923ac6f3be1fd8
Author: Translation commit bot 
Date:   Tue Nov 7 10:50:50 2017 +

Update translations for tor-browser-manual
---
 it/it.po | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/it/it.po b/it/it.po
index 6b98cb38e..5c3b2d504 100644
--- a/it/it.po
+++ b/it/it.po
@@ -1051,6 +1051,13 @@ msgid ""
 " many websites from displaying correctly, so Tor Browserâs default setting "
 "is to allow all websites to run scripts."
 msgstr ""
+"Utenti che richiedono un alto livello di sicurezza durante la navigazione "
+"internet dovrebbero settare la  Tab di "
+"Sicurezzaa \"Medio-Alta\" (questo disabiliterÃ  Javascriptsper le "
+"pagine non-HTTPS) o \"Alta\" ( che disibilita il JavaScript per tutte le "
+"pagine). Purtroppo, disabilitando Javascript, alcuni siti potrebbero avere "
+"problemi di visualizzazione;. Per questo motivo le impostazioni di default "
+"del browser Tor, permette ai siti di eseguire scripts."
 
 #: plugins.page:58
 msgid "Browser Add-ons"
@@ -1229,6 +1236,9 @@ msgid ""
 "Increasing the level of the Security Slider will disable or partially "
 "disable certain browser features to protect against possible attacks."
 msgstr ""
+"Aumentendo il livello della Tab di sicurezza disabiliterÃ  totalmente o "
+"parzialmente alcune caratteristiche del browser  per proteggervi contro "
+"possibili attacchi"
 
 #: security-slider.page:42
 msgid "High"
@@ -1284,11 +1294,11 @@ msgstr ""
 
 #: transports.page:6 transports.page:20
 msgid "Types of pluggable transport"
-msgstr ""
+msgstr "Tipi di pluggable transports"
 
 #: transports.page:10
 msgid "Pluggable Transports"
-msgstr ""
+msgstr "Pluggable transports"
 
 #: transports.page:12
 msgid ""
@@ -1297,12 +1307,18 @@ msgid ""
 "Provider or other authority is actively blocking connections to the Tor "
 "network."
 msgstr ""
+"I Pluggable transports sono degli strumenti utilizzati dal browser Tor per "
+"nascondere il traffico inviato. Questo puÃ² risultare utile nelle situazioni "
+"in cui il fornitore di servizi internet o un'altra autoritÃ  stiano "
+"attivamente bloccando le connessioni alla rete Tor"
 
 #: transports.page:21
 msgid ""
 "Currently there are six pluggable transports available, but more are being "
 "developed."
 msgstr ""
+"Al momento esistono 6 tipi di pluggable transports, ma ne stanno venendo "
+"sviluppati di nuovi"
 
 #: transports.page:28
 msgid "obfs3"
@@ -1313,6 +1329,8 @@ msgid ""
 "obfs3 makes Tor traffic look random, so that it does not look like Tor or "
 "any other protocol. obfs3 bridges will work in most places."
 msgstr ""
+"obfs3 fa sembrare il traffico Tor casuale, questo non fa sembrare Tor o "
+"altro protocollo. I ponti obfs3 funzionano nella maggior parte dei posti"
 
 #: transports.page:42
 msgid "obfs4"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2017-11-07 Thread translation

commit 00a199aea637a493dca9c9145092ee236e51c069
Author: Translation commit bot 
Date:   Tue Nov 7 10:48:51 2017 +

Update translations for tails-openpgp-applet
---
 et/openpgp-applet.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/et/openpgp-applet.pot b/et/openpgp-applet.pot
index 6536bc11e..cdf8aeab4 100644
--- a/et/openpgp-applet.pot
+++ b/et/openpgp-applet.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2017-09-22 17:51+\n"
+"PO-Revision-Date: 2017-11-07 10:20+\n"
 "Last-Translator: Kristjan RÃ¤ts \n"
 "Language-Team: Estonian 
(http://www.transifex.com/otf/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
 
 #: bin/openpgp-applet:175
 msgid "Exit"
-msgstr ""
+msgstr "VÃ¤lju"
 
 #: bin/openpgp-applet:177
 msgid "About"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-11-07 Thread translation

commit 6a9b72828572509f99ebe81e00c713be371270dd
Author: Translation commit bot 
Date:   Tue Nov 7 09:50:51 2017 +

Update translations for tor-browser-manual
---
 it/it.po | 19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/it/it.po b/it/it.po
index 19f5a8864..fe1e863ed 100644
--- a/it/it.po
+++ b/it/it.po
@@ -783,6 +783,8 @@ msgid ""
 "You can see a diagram of the circuit that Tor Browser is using for the "
 "current tab in the onion menu."
 msgstr ""
+"Voi potrete vedere un diagramma del circuito utilizzato dal browser Tor per "
+"la scheda attiva nel menu cipolla"
 
 #: managing-identities.page:55
 msgid "Logging in over Tor"
@@ -843,12 +845,16 @@ msgid ""
 "external ref='media/managing-identities/new_identity.png' "
 "md5='15b01e35fa83185d94b57bf0ccf09d76'"
 msgstr ""
+"link esterno ref='media/managing-identities/new_identity.png' "
+"md5='15b01e35fa83185d94b57bf0ccf09d76'"
 
 #: managing-identities.page:105
 msgid ""
 "Tor Browser features âNew Identityâ and âNew Tor Circuit for this 
Siteâ "
 "options, located in the Torbutton menu."
 msgstr ""
+"Il servizio del Browser Tor \"Nuova identitÃ \" e \"Nuovo circuito Tor\" si "
+"trova nel menu del pulsante Tor"
 
 #: managing-identities.page:111
 msgid "New Identity"
@@ -935,6 +941,8 @@ msgid ""
 "external ref='media/onionsites/onion_url.png' "
 "md5='f97f7fe10f07c3959c4430934974bbaa'"
 msgstr ""
+"link esterno ref='media/onionsites/onion_url.png' "
+"md5='f97f7fe10f07c3959c4430934974bbaa'"
 
 #: onionsites.page:50
 msgid ""
@@ -942,6 +950,9 @@ msgid ""
 "service in order to connect to it. An onion address is a string of sixteen "
 "mostly random letters and numbers, followed by â.onionâ."
 msgstr ""
+"Come qualsiasi altro sito web, avrete bisogno dell'indirizzo del servizio "
+"onion per potervi connettere. Un indirizzo onion Ã¨ una stringa casuale di 16"
+" caratteri e numeri seguiti dal suffisso \".onion\""
 
 #: onionsites.page:58 troubleshooting.page:10
 msgid "Troubleshooting"
@@ -970,7 +981,7 @@ msgstr ""
 
 #: plugins.page:6
 msgid "How Tor Browser handles add-ons, plugins and JavaScript"
-msgstr ""
+msgstr "Come il browser Tor gestisce add-ons, plugins e JavaScript"
 
 #: plugins.page:10
 msgid "Plugins, add-ons and JavaScript"
@@ -1165,7 +1176,7 @@ msgstr ""
 
 #: security-slider.page:21
 msgid "Accessing the Security Slider"
-msgstr ""
+msgstr "Accesso alle opzioni di sicurezza"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -1185,6 +1196,8 @@ msgid ""
 "The Security Slider is located in Torbuttonâs âPrivacy and Security "
 "Settingsâ menu."
 msgstr ""
+"Le opzioni di sicurezza sono situate nel menu \"Privacy a Impostazioni di "
+"sicurezza\" del pulsante Tor"
 
 #: security-slider.page:32
 msgid "Security Levels"
@@ -1456,6 +1469,8 @@ msgstr "Svuota il cestino"
 msgid ""
 "Note that your operating systemâs standard âUninstallâ utility is not 
used."
 msgstr ""
+"Nota che l'applicazione standard per disinstallare i programmi non verrÃ  "
+"utilizzata"
 
 #: updating.page:6
 msgid "How to update Tor Browser"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2017-11-07 Thread translation

commit bf8e8c2082bf3f0cd5ba2aec91b259347907
Author: Translation commit bot 
Date:   Tue Nov 7 22:45:39 2017 +

Update translations for https_everywhere
---
 nl/https-everywhere.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/https-everywhere.properties b/nl/https-everywhere.properties
index 0d5e56b40..624af7493 100644
--- a/nl/https-everywhere.properties
+++ b/nl/https-everywhere.properties
@@ -4,5 +4,5 @@ https-everywhere.menu.enableDisable = Regels in-/uitschakelen
 https-everywhere.menu.noRules = (Geen regels voor deze pagina)
 https-everywhere.menu.unknownRules = (Regels voor deze pagina onbekend)
 https-everywhere.toolbar.hint = HTTPS Everywhere is nu actief. Je kunt dit 
aanpassen door op een site-by-site basis te klikken op het icoon in de 
adresbalk.
-https-everywhere.migration.notification0 = Om een cruciale oplossing te 
bewerkstelligen, reset deze update je HTTPS Everywhere regels voorkeuren naar 
de standaard waarden.
+https-everywhere.migration.notification0 = Om een cruciale oplossing te 
implementeren, reset deze update je HTTPS Everywhere regel voorkeuren naar de 
standaard waarden.
 https-everywhere.menu.ruleset-tests = Voer de HTTPS Everywhere Ruleset Tests 
uit

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2017-11-07 Thread translation

commit e3dac4965044190c3f28e4ab6915c600477e7af7
Author: Translation commit bot 
Date:   Tue Nov 7 22:45:51 2017 +

Update translations for https_everywhere_completed
---
 nl/https-everywhere.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/https-everywhere.properties b/nl/https-everywhere.properties
index 0d5e56b40..624af7493 100644
--- a/nl/https-everywhere.properties
+++ b/nl/https-everywhere.properties
@@ -4,5 +4,5 @@ https-everywhere.menu.enableDisable = Regels in-/uitschakelen
 https-everywhere.menu.noRules = (Geen regels voor deze pagina)
 https-everywhere.menu.unknownRules = (Regels voor deze pagina onbekend)
 https-everywhere.toolbar.hint = HTTPS Everywhere is nu actief. Je kunt dit 
aanpassen door op een site-by-site basis te klikken op het icoon in de 
adresbalk.
-https-everywhere.migration.notification0 = Om een cruciale oplossing te 
bewerkstelligen, reset deze update je HTTPS Everywhere regels voorkeuren naar 
de standaard waarden.
+https-everywhere.migration.notification0 = Om een cruciale oplossing te 
implementeren, reset deze update je HTTPS Everywhere regel voorkeuren naar de 
standaard waarden.
 https-everywhere.menu.ruleset-tests = Voer de HTTPS Everywhere Ruleset Tests 
uit

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] prop284: Improve the ADD_ONION new key type wording

2017-11-07 Thread nickm

commit f8122635bc45342243c248d9763b8fbb281a62b7
Author: David Goulet 
Date:   Tue Nov 7 15:04:16 2017 -0500

prop284: Improve the ADD_ONION new key type wording

Also define the new ed25519 key blob encoding format which is the same
format as the current v2 key blob is expected to be in.

Closes #24165

Signed-off-by: David Goulet 
---
 proposals/284-hsv3-control-port.txt | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/proposals/284-hsv3-control-port.txt 
b/proposals/284-hsv3-control-port.txt
index f2d03f6..e229bf9 100644
--- a/proposals/284-hsv3-control-port.txt
+++ b/proposals/284-hsv3-control-port.txt
@@ -88,11 +88,16 @@ Status: Open
New "KeyType" value to "ED25519-V3" which identifies the key type to be a
v3 ed25519 key.
 
-   New "KeyBlob" value to support the new "ED25519-V3", if specified, will
-   generate a new ed25519 private key.
+   With the KeyType == "ED25519-V3", the "KeyBlob" should be a base64 encoded
+   ed25519 private key.
+
+   The "NEW:BEST" option will still return a version 2 address as long as the
+   HiddenServiceVersion torrc option default is 2. To ask for a new v3 key,
+   this should be used: "NEW:ED25519-V3".
 
Because client authentication is not yet implemented, the "ClientAuth"
-   field is ignored as well as "Flags=BasicAuth".
+   field is ignored as well as "Flags=BasicAuth". A 513 error is returned if
+   "ClientAuth" is used with an ED25519-V3 key type.
 
 3.1.4. DEL_ONION
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-11-07 Thread translation

commit 8630b6b8e799d60ecc50491e94ef462eca7c820e
Author: Translation commit bot 
Date:   Tue Nov 7 11:22:27 2017 +

Update translations for tor-browser-manual
---
 it/it.po | 40 +++-
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/it/it.po b/it/it.po
index 5c3b2d504..2e11ec06b 100644
--- a/it/it.po
+++ b/it/it.po
@@ -4,14 +4,13 @@
 # Sebastiano Pistore , 2016
 # paolo buratti <>, 2016
 # fetidyoo , 2016
-# Gabriele , 2016
+# Paveway noname , 2016
 # Luca Marzo , 2016
 # runasand , 2016
 # Andrea S. , 2016
 # Him-Calan Je Distros , 2016
 # Alessandro Toffalini , 2016
 # Massimo Scacco , 2017
-# Paveway noname , 2017
 # Daniele , 2017
 # Giuseppe Pignataro (Fasbyte01) , 2017
 # s r , 2017
@@ -137,11 +136,11 @@ msgstr ""
 
 #: bridges.page:6
 msgid "Learn what bridges are and how to get them"
-msgstr "Impara cosa sono i ponti e come ottenerli"
+msgstr "Impara cosa sono i nodi e come ottenerli"
 
 #: bridges.page:10
 msgid "Bridges"
-msgstr "Ponti"
+msgstr "nodi"
 
 #: bridges.page:12
 msgid ""
@@ -159,6 +158,9 @@ msgid ""
 "techniques that do not rely on bridges. You do not need to obtain bridge "
 "addresses in order to use these transports."
 msgstr ""
+"Altri pluggable transport, come meek, usano differenti sistemi anti censura "
+"che non fanno affidamento su nodi. Non avrete bisogno di utilizzare "
+"indirizzi di nodi per utilizzare questi pluggable transports"
 
 #: bridges.page:28
 msgid "Getting bridge addresses"
@@ -209,7 +211,7 @@ msgid ""
 "address on a separate line."
 msgstr ""
 "Seleziona \"si\" quando ti verrÃ  richiesto, se il tuo Provider di servizi "
-"Internet blocca le connessioni alla rete Tor. Seleziona \"Usa bridges "
+"Internet blocca le connessioni alla rete Tor. Seleziona \"Usa nodi "
 "personalizzati\" ed inserisci gli indirizzi dei bridges, uno per ogni riga."
 
 #. This is a reference to an external file such as an image or video. When
@@ -232,10 +234,10 @@ msgid ""
 " may be down. Please use one of the above methods to obtain more bridge "
 "addresses, and try again."
 msgstr ""
-"Clicca \"Connetti\". L'utilizzo dei bridges potrebbe rallentare la "
-"connessione, rispetto ai normali relays Tor. Se la connessione non va a buon"
-" fine, il bridge che hai ricevuto potrebbe essere disattivo. Utilizza uno "
-"dei metodi qui sopra per ottenere piÃ¹ bridges e riprova."
+"Clicca \"Connetti\". L'utilizzo dei nodi potrebbe rallentare la connessione,"
+" rispetto ai normali relays Tor. Se la connessione non va a buon fine, il "
+"nodo che hai ricevuto potrebbe essere disattivo. Utilizza uno dei metodi qui"
+" sopra per ottenere piÃ¹ bridges e riprova."
 
 #: circumvention.page:6
 msgid "What to do if the Tor network is blocked"
@@ -358,8 +360,8 @@ msgid ""
 msgstr ""
 "Nel caso abbiate provato ad utilizzare tutti questi trasporti e nessuno di "
 "essi vi riesce a portare online dovrete inserire l'indirizzo del ponte "
-"manualmente. Leggete la sezione Pontiper "
-"imparare cosa sono i ponti e come ottenerli"
+"manualmente. Leggete la sezione nodiper "
+"imparare cosa sono i nodi e come ottenerli"
 
 #: downloading.page:7
 msgid "How to download Tor Browser"
@@ -820,6 +822,9 @@ msgid ""
 "See the Secure Connections page for"
 " important information on how to secure your connection when logging in."
 msgstr ""
+"Guarda la pagina Connessione "
+"sicuraper importanti informazioni sul come rendere piu sicura la tua "
+"connessione quando accedi"
 
 #: managing-identities.page:87
 msgid ""
@@ -905,6 +910,8 @@ msgid ""
 "Onion services offer several advantages over ordinary services on the non-"
 "private web:"
 msgstr ""
+"I servizi onion offrono molteplici vantaggi rispetto ai servizi ordinari "
+"sulla rete non privata:"
 
 #: onionsites.page:23
 msgid ""
@@ -920,6 +927,10 @@ msgid ""
 " you do not need to worry about connecting"
 " over HTTPS."
 msgstr ""
+"Tutto il traffico attraverso gli utenti Tor ed il servizio onion sono "
+"crittografati con sistema end-to-end; per questo motivo non Ã¨ necessario "
+"preoccuparsi del connettersi attraverso "
+"HTTPS."
 
 #: onionsites.page:36
 msgid ""
@@ -1330,7 +1341,7 @@ msgid ""
 "any other protocol. obfs3 bridges will work in most places."
 msgstr ""
 "obfs3 fa sembrare il traffico Tor casuale, questo non fa sembrare Tor o "
-"altro protocollo. I ponti obfs3 funzionano nella maggior parte dei posti"
+"altro protocollo. I nodi obfs3 funzionano nella maggior parte dei posti"
 
 #: transports.page:42
 msgid "obfs4"
@@ -1342,6 +1353,9 @@ msgid ""
 "from finding bridges by Internet scanning. obfs4 bridges are less likely

[tor-commits] [webwml/master] Unrecommend 7.5a5/6 OS X and Linux versions

2017-11-07 Thread gk

commit b7e94466177496a9946b78bc8bdb8c4d9a8d1499
Author: Georg Koppen 
Date:   Tue Nov 7 13:06:03 2017 +

Unrecommend 7.5a5/6 OS X and Linux versions
---
 projects/torbrowser/RecommendedTBBVersions | 4 
 1 file changed, 4 deletions(-)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index e1975a9b..ba4097e7 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -9,13 +9,9 @@
 "7.0.9-MacOS",
 "7.0.9-Linux",
 "7.5a5",
-"7.5a5-MacOS",
 "7.5a5-Windows",
-"7.5a5-Linux",
 "7.5a6",
-"7.5a6-MacOS",
 "7.5a6-Windows",
-"7.5a6-Linux",
 "7.5a7",
 "7.5a7-MacOS",
 "7.5a7-Linux"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-11-07 Thread translation

commit 23709d43a43ed039e3e298a084d604d90504a904
Author: Translation commit bot 
Date:   Tue Nov 7 14:20:38 2017 +

Update translations for tor-browser-manual
---
 it/it.po | 8 
 1 file changed, 8 insertions(+)

diff --git a/it/it.po b/it/it.po
index 2e11ec06b..ed2a79b4e 100644
--- a/it/it.po
+++ b/it/it.po
@@ -504,6 +504,8 @@ msgid ""
 "Wait for your download to finish, then find the âGenerate Hashâ section 
in "
 "Satoriâs menu and click âSelect Filesâ."
 msgstr ""
+"Aspettate che il download sia terminato, poi cercate il menu \"Genera hash\""
+" tra i menu di Satori e clicca su \" Seleziona files\""
 
 #: downloading.page:121
 msgid ""
@@ -904,6 +906,8 @@ msgid ""
 "Onion services (formerly known as âhidden servicesâ) are services (like "
 "websites) that are only accessible through the Tor network."
 msgstr ""
+"I servizi Onion ( conosciuti anche come \"Servizi nascosti\") sono servizi ("
+" come i siti web) a cui Ã¨ possibile accedere solo attraverso la rete Tor"
 
 #: onionsites.page:16
 msgid ""
@@ -939,6 +943,10 @@ msgid ""
 " that it is connecting to the right location and that the connection is not "
 "being tampered with."
 msgstr ""
+"Gli indirizzi di un servizio onion sono generati automaticamente, gli utenti"
+" quindi non hanno bisogno di comprare un dominio; il suffisso .onion aiuta "
+"Tor ad accertarsi che sia connesso all'indirizzo corretto e che la "
+"connessione non sia stata reindirizzata"
 
 #: onionsites.page:46
 msgid "How to access an onion service"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] test: Fix voting schedule for shared random

2017-11-07 Thread nickm

commit 19d32fd0d643117cc809bafb1a68d1e004d806f3
Author: David Goulet 
Date:   Tue Oct 31 14:39:27 2017 -0400

test: Fix voting schedule for shared random

Part of #23623

Signed-off-by: David Goulet 
---
 src/test/test_shared_random.c | 142 ++
 1 file changed, 60 insertions(+), 82 deletions(-)

diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index d9daa26ce..cac78baec 100644
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -131,7 +131,15 @@ test_get_sr_protocol_phase(void *arg)
   ;
 }
 
-static networkstatus_t *mock_consensus = NULL;
+static networkstatus_t mock_consensus;
+
+/* Mock function to immediately return our local 'mock_consensus'. */
+static networkstatus_t *
+mock_networkstatus_get_live_consensus(time_t now)
+{
+  (void) now;
+  return _consensus;
+}
 
 static void
 test_get_state_valid_until_time(void *arg)
@@ -143,11 +151,23 @@ test_get_state_valid_until_time(void *arg)
 
   (void) arg;
 
+  MOCK(networkstatus_get_live_consensus,
+   mock_networkstatus_get_live_consensus);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC",
+  _consensus.fresh_until);
+  tt_int_op(retval, OP_EQ, 0);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
+  _consensus.valid_after);
+  tt_int_op(retval, OP_EQ, 0);
+
   {
 /* Get the valid until time if called at 00:00:01 */
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:01 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 /* Compare it with the correct result */
@@ -159,6 +179,7 @@ test_get_state_valid_until_time(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 19:22:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 format_iso_time(tbuf, valid_until_time);
@@ -169,6 +190,7 @@ test_get_state_valid_until_time(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 23:59:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 format_iso_time(tbuf, valid_until_time);
@@ -179,6 +201,7 @@ test_get_state_valid_until_time(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 format_iso_time(tbuf, valid_until_time);
@@ -186,7 +209,7 @@ test_get_state_valid_until_time(void *arg)
   }
 
  done:
-  ;
+  UNMOCK(networkstatus_get_live_consensus);
 }
 
 /** Test the function that calculates the start time of the current SRV
@@ -200,11 +223,23 @@ test_get_start_time_of_current_run(void *arg)
 
   (void) arg;
 
+  MOCK(networkstatus_get_live_consensus,
+   mock_networkstatus_get_live_consensus);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC",
+  _consensus.fresh_until);
+  tt_int_op(retval, OP_EQ, 0);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
+  _consensus.valid_after);
+  tt_int_op(retval, OP_EQ, 0);
+
   {
 /* Get start time if called at 00:00:01 */
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:01 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 run_start_time =
   sr_state_get_start_time_of_current_protocol_run(current_time);
 
@@ -217,6 +252,7 @@ test_get_start_time_of_current_run(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 23:59:59 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 run_start_time =
   sr_state_get_start_time_of_current_protocol_run(current_time);
 
@@ -229,6 +265,7 @@ test_get_start_time_of_current_run(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 run_start_time =
   sr_state_get_start_time_of_current_protocol_run(current_time);
 
@@ -237,6 +274,10 @@ test_get_start_time_of_current_run(void *arg)
 tt_str_op("2015-04-20 00:00:00", OP_EQ, tbuf);
   }
 
+  /* Next test is testing it without a consensus to use the testing voting
+   * interval . */
+

[tor-commits] [tor/master] Merge remote-tracking branch 'asn/ticket23623_032_01' into maint-0.3.2

2017-11-07 Thread nickm

commit 9d848ca58a4624df7abae298d8977ae82bcfb543
Merge: 7d767706e 023f62bda
Author: Nick Mathewson 
Date:   Tue Nov 7 09:58:42 2017 -0500

Merge remote-tracking branch 'asn/ticket23623_032_01' into maint-0.3.2

 changes/bug23623  |   4 ++
 src/or/dirvote.c  |  68 ---
 src/or/dirvote.h  |   7 +-
 src/or/shared_random.c|   8 +--
 src/or/shared_random_state.c  |  17 ++---
 src/or/shared_random_state.h  |   2 +-
 src/test/test_dir.c   |   1 +
 src/test/test_hs_common.c |  21 +-
 src/test/test_hs_service.c|   4 ++
 src/test/test_shared_random.c | 149 +-
 10 files changed, 126 insertions(+), 155 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'asn/ticket23623_032_01' into maint-0.3.2

2017-11-07 Thread nickm

commit 9d848ca58a4624df7abae298d8977ae82bcfb543
Merge: 7d767706e 023f62bda
Author: Nick Mathewson 
Date:   Tue Nov 7 09:58:42 2017 -0500

Merge remote-tracking branch 'asn/ticket23623_032_01' into maint-0.3.2

 changes/bug23623  |   4 ++
 src/or/dirvote.c  |  68 ---
 src/or/dirvote.h  |   7 +-
 src/or/shared_random.c|   8 +--
 src/or/shared_random_state.c  |  17 ++---
 src/or/shared_random_state.h  |   2 +-
 src/test/test_dir.c   |   1 +
 src/test/test_hs_common.c |  21 +-
 src/test/test_hs_service.c|   4 ++
 src/test/test_shared_random.c | 149 +-
 10 files changed, 126 insertions(+), 155 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] test: Fix voting schedule for hs_service.c

2017-11-07 Thread nickm

commit bd631a649b5cfae23fc13be08c72d5c1c0c70174
Author: David Goulet 
Date:   Tue Oct 31 14:48:27 2017 -0400

test: Fix voting schedule for hs_service.c

Part of #23623

Signed-off-by: David Goulet 
---
 src/test/test_hs_service.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 462c860a9..3084c6b95 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -33,6 +33,7 @@
 #include "circuitlist.h"
 #include "circuituse.h"
 #include "crypto.h"
+#include "dirvote.h"
 #include "networkstatus.h"
 #include "nodelist.h"
 #include "relay.h"
@@ -967,6 +968,7 @@ test_rotate_descriptors(void *arg)
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 14:00:00 UTC",
_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), mock_ns.valid_after);
 
   /* Create a service with a default descriptor and state. It's added to the
* global map. */
@@ -1004,6 +1006,7 @@ test_rotate_descriptors(void *arg)
   ret = parse_rfc1123_time("Sat, 27 Oct 1985 02:00:00 UTC",
_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), mock_ns.valid_after);
 
   /* Note down what to expect for the next rotation time which is 01:00 + 23h
* meaning 00:00:00. */
@@ -1065,6 +1068,7 @@ test_build_update_descriptors(void *arg)
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 04:00:00 UTC",
_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), mock_ns.valid_after);
 
   /* Create a service without a current descriptor to trigger a build. */
   service = helper_create_service();



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] test: Fix voting schedule for hs_common.c

2017-11-07 Thread nickm

commit 814f4c6967d068f15ace98f78953a5dba0154ee7
Author: David Goulet 
Date:   Tue Oct 31 14:46:21 2017 -0400

test: Fix voting schedule for hs_common.c

Part of #23623

Signed-off-by: David Goulet 
---
 src/test/test_hs_common.c | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 22fed12f1..b435a93e3 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -23,6 +23,7 @@
 #include "config.h"
 #include "networkstatus.h"
 #include "directory.h"
+#include "dirvote.h"
 #include "nodelist.h"
 #include "routerlist.h"
 #include "statefile.h"
@@ -808,26 +809,41 @@ test_time_between_tp_and_srv(void *arg)
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 00:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 01:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 0);
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 11:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 12:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 0);
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 12:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 1);
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 23:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 27 Oct 1985 00:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 1);
 
-  ret = parse_rfc1123_time("Sat, 26 Oct 1985 00:00:00 UTC", _after);
+  ret = parse_rfc1123_time("Sat, 27 Oct 1985 00:00:00 UTC", _after);
+  tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 27 Oct 1985 01:00:00 UTC", _until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 0);
 
@@ -1314,6 +1330,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, 
int num_scenario)
   _service_ns->valid_until);
   set_consensus_times(cfg->service_valid_until,
   _service_ns->fresh_until);
+  dirvote_recalculate_timing(get_options(), mock_service_ns->valid_after);
   /* Set client consensus time. */
   set_consensus_times(cfg->client_valid_after,
   _client_ns->valid_after);
@@ -1321,6 +1338,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, 
int num_scenario)
   _client_ns->valid_until);
   set_consensus_times(cfg->client_valid_until,
   _client_ns->fresh_until);
+  dirvote_recalculate_timing(get_options(), mock_client_ns->valid_after);
 
   /* New time period checks for this scenario. */
   tt_int_op(hs_in_period_between_tp_and_srv(mock_service_ns, 0), OP_EQ,
@@ -1544,6 +1562,7 @@ helper_set_consensus_and_system_time(networkstatus_t *ns, 
int position)
   } else {
 tt_assert(0);
   }
+  dirvote_recalculate_timing(get_options(), ns->valid_after);
 
   /* Set system time: pretend to be just 2 minutes before consensus expiry */
   real_time = ns->valid_until - 120;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-11-07 Thread nickm

commit c6c4a421fd7d8a0d4baba8f34276acaa245548f1
Merge: 0227aab1b 9d848ca58
Author: Nick Mathewson 
Date:   Tue Nov 7 09:58:53 2017 -0500

Merge branch 'maint-0.3.2'

 changes/bug23623  |   4 ++
 src/or/dirvote.c  |  68 ---
 src/or/dirvote.h  |   7 +-
 src/or/shared_random.c|   8 +--
 src/or/shared_random_state.c  |  17 ++---
 src/or/shared_random_state.h  |   2 +-
 src/test/test_dir.c   |   1 +
 src/test/test_hs_common.c |  21 +-
 src/test/test_hs_service.c|   4 ++
 src/test/test_shared_random.c | 149 +-
 10 files changed, 126 insertions(+), 155 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] test: Fix voting schedule for hs_service.c

2017-11-07 Thread nickm

commit bd631a649b5cfae23fc13be08c72d5c1c0c70174
Author: David Goulet 
Date:   Tue Oct 31 14:48:27 2017 -0400

test: Fix voting schedule for hs_service.c

Part of #23623

Signed-off-by: David Goulet 
---
 src/test/test_hs_service.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 462c860a9..3084c6b95 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -33,6 +33,7 @@
 #include "circuitlist.h"
 #include "circuituse.h"
 #include "crypto.h"
+#include "dirvote.h"
 #include "networkstatus.h"
 #include "nodelist.h"
 #include "relay.h"
@@ -967,6 +968,7 @@ test_rotate_descriptors(void *arg)
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 14:00:00 UTC",
_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), mock_ns.valid_after);
 
   /* Create a service with a default descriptor and state. It's added to the
* global map. */
@@ -1004,6 +1006,7 @@ test_rotate_descriptors(void *arg)
   ret = parse_rfc1123_time("Sat, 27 Oct 1985 02:00:00 UTC",
_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), mock_ns.valid_after);
 
   /* Note down what to expect for the next rotation time which is 01:00 + 23h
* meaning 00:00:00. */
@@ -1065,6 +1068,7 @@ test_build_update_descriptors(void *arg)
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 04:00:00 UTC",
_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), mock_ns.valid_after);
 
   /* Create a service without a current descriptor to trigger a build. */
   service = helper_create_service();



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] test: Initialize the voting schedule in test_dir.c

2017-11-07 Thread nickm

commit 33da5d7672dc7ac13ce2093a5789fb6bc48e4f86
Author: David Goulet 
Date:   Tue Oct 31 14:07:41 2017 -0400

test: Initialize the voting schedule in test_dir.c

Signed-off-by: David Goulet 
---
 src/test/test_dir.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index b920655db..87b86c38b 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -2379,6 +2379,7 @@ test_a_networkstatus(
   sign_skey_2 = crypto_pk_new();
   sign_skey_3 = crypto_pk_new();
   sign_skey_leg1 = pk_generate(4);
+  dirvote_recalculate_timing(get_options(), now);
   sr_state_init(0, 0);
 
   tt_assert(!crypto_pk_read_private_key_from_string(sign_skey_1,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Make tor recalculate voting schedule even if not a dirauth

2017-11-07 Thread nickm

commit ce99ebf25d3aec18ad840062a949aca4f98c14e6
Author: David Goulet 
Date:   Tue Oct 31 09:54:55 2017 -0400

Make tor recalculate voting schedule even if not a dirauth

Because the HS subsystem needs the voting schedule to compute time period, 
we
need all tor type to do that.

Part of #23623

Signed-off-by: David Goulet 
---
 src/or/dirvote.c | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 6f237e9b2..c5ceefecb 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2863,16 +2863,13 @@ dirvote_get_next_valid_after_time(void)
 }
 
 /** Set voting_schedule to hold the timing for the next vote we should be
- * doing. */
+ * doing. All type of tor do that because HS subsystem needs the timing as
+ * well to function properly. */
 void
 dirvote_recalculate_timing(const or_options_t *options, time_t now)
 {
   voting_schedule_t *new_voting_schedule;
 
-  if (!authdir_mode_v3(options)) {
-return;
-  }
-
   /* get the new voting schedule */
   new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE);
   tor_assert(new_voting_schedule);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Rename arm to nyx on the website

2017-11-07 Thread atagar

commit 479fd0806af780fe5572acd4427b2d4f1e841d1a
Author: Damian Johnson 
Date:   Tue Nov 7 09:10:20 2017 -0800

Rename arm to nyx on the website
---
 docs/_static/label/arm.png| Bin 780 -> 0 bytes
 docs/_static/label/nyx.png| Bin 0 -> 848 bytes
 docs/_static/label/resources/arm.xcf  | Bin 2286 -> 0 bytes
 docs/_static/label/resources/nyx.xcf  | Bin 0 -> 2302 bytes
 docs/_static/{arm.png => nyx.png} | Bin
 docs/faq.rst  |   4 ++--
 docs/index.rst|   2 +-
 docs/tutorials/double_double_toil_and_trouble.rst |  10 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/_static/label/arm.png b/docs/_static/label/arm.png
deleted file mode 100644
index 8bbfd681..
Binary files a/docs/_static/label/arm.png and /dev/null differ
diff --git a/docs/_static/label/nyx.png b/docs/_static/label/nyx.png
new file mode 100644
index ..344b0612
Binary files /dev/null and b/docs/_static/label/nyx.png differ
diff --git a/docs/_static/label/resources/arm.xcf 
b/docs/_static/label/resources/arm.xcf
deleted file mode 100644
index 903d5602..
Binary files a/docs/_static/label/resources/arm.xcf and /dev/null differ
diff --git a/docs/_static/label/resources/nyx.xcf 
b/docs/_static/label/resources/nyx.xcf
new file mode 100644
index ..7915a82d
Binary files /dev/null and b/docs/_static/label/resources/nyx.xcf differ
diff --git a/docs/_static/arm.png b/docs/_static/nyx.png
similarity index 100%
rename from docs/_static/arm.png
rename to docs/_static/nyx.png
diff --git a/docs/faq.rst b/docs/faq.rst
index 2a0af082..7f65911c 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -37,7 +37,7 @@ What is Stem?
 
 Stem is a Python controller library that you can use to interact with `Tor
 `_. With it you can write scripts and applications
-with capabilities similar `arm `_.
+with capabilities similar `Nyx `_.
 
 From a technical standpoint, Stem is a Python implementation of Tor's
 `directory `_ and
@@ -356,7 +356,7 @@ An important thing to note is that a new circuit does not 
necessarily mean a new
 
 Tor does not have a method for cycling your IP address. This is on purpose, 
and done for a couple reasons. The first is that this capability is usually 
requested for not-so-nice reasons such as ban evasion or SEO. Second, repeated 
circuit creation puts a very high load on the Tor network, so please don't!
 
-With all that out of the way, how do you create a new circuit? You can 
customize the rate at which Tor cycles circuits with the 
**MaxCircuitDirtiness** option in your `torrc 
`_. `Vidalia 
`_ and `arm 
`_ both provide a method to request a new 
identity, and you can do so programmatically by sending Tor a NEWNYM signal.
+With all that out of the way, how do you create a new circuit? You can 
customize the rate at which Tor cycles circuits with the 
**MaxCircuitDirtiness** option in your `torrc 
`_. `Vidalia 
`_ and `Nyx 
`_ both provide a method to request a new 
identity, and you can do so programmatically by sending Tor a NEWNYM signal.
 
 To do this with telnet...
 
diff --git a/docs/index.rst b/docs/index.rst
index dc7ec89e..345798b5 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,7 +1,7 @@
 Welcome to Stem!
 
 
-Stem is a Python controller library for `Tor `_. 
With it you can use Tor's `control protocol 
`_ to script 
against the Tor process, or build things such as `arm 
`_. Stem's latest version is **1.6.0** (released 
November 5th, 2017).
+Stem is a Python controller library for `Tor `_. 
With it you can use Tor's `control protocol 
`_ to script 
against the Tor process, or build things such as `Nyx 
`_. Stem's latest version is **1.6.0** (released 
November 5th, 2017).
 
 .. Main Stem Logo
Source: http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html
diff --git a/docs/tutorials/double_double_toil_and_trouble.rst 
b/docs/tutorials/double_double_toil_and_trouble.rst
index 7822c0b3..111952c6 100644
--- a/docs/tutorials/double_double_toil_and_trouble.rst
+++ b/docs/tutorials/double_double_toil_and_trouble.rst
@@ -10,7 +10,7 @@ Applications
 
 .. Image Sources:

-   * Arm
+   * Nyx
  Source: Oxygen

[tor-commits] [translation/tor-launcher-progress] Update translations for tor-launcher-progress

2017-11-07 Thread translation

commit a627755f71086131a3165f48fe080db405c7d98d
Author: Translation commit bot 
Date:   Tue Nov 7 23:16:43 2017 +

Update translations for tor-launcher-progress
---
 nl/progress.dtd | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nl/progress.dtd b/nl/progress.dtd
index a7ced454e..208705b3b 100644
--- a/nl/progress.dtd
+++ b/nl/progress.dtd
@@ -1,5 +1,4 @@
 
 
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed

2017-11-07 Thread translation

commit 067e6397275ad745790523a51ee853dcf8c0e08f
Author: Translation commit bot 
Date:   Tue Nov 7 23:16:48 2017 +

Update translations for tor-launcher-progress_completed
---
 nl/progress.dtd | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nl/progress.dtd b/nl/progress.dtd
index a7ced454e..208705b3b 100644
--- a/nl/progress.dtd
+++ b/nl/progress.dtd
@@ -1,5 +1,4 @@
 
 
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Revert "Remove an erroneous 0.5 in compute_weighted_bandwidths()"

2017-11-07 Thread nickm

commit 3dc61a5d71423e86d4d8090a90782a1ddf164880
Author: Nick Mathewson 
Date:   Tue Nov 7 20:35:19 2017 -0500

Revert "Remove an erroneous 0.5 in compute_weighted_bandwidths()"

This reverts commit 01e984870a7e1db2722e85fe43af7bcb4755c2d4.
---
 changes/bug23318| 7 ---
 src/or/routerlist.c | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/changes/bug23318 b/changes/bug23318
deleted file mode 100644
index 32c85eb19..0
--- a/changes/bug23318
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (path selection):
-- When selecting relays by bandwidth, avoid a rounding error that
-  could sometimes cause load to be imbalanced incorrectly. Previously,
-  we would always round upwards; now, we round towards the nearest
-  integer.  This had the biggest effect when a relay's weight adjustments
-  should have given it weight 0, but it got weight 1 instead.
-  Fixes bug 23318; bugfix on 0.2.4.3-alpha.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f0bd343f4..c7c109253 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2706,7 +2706,7 @@ compute_weighted_bandwidths(const smartlist_t *sl,
   final_weight = weight*this_bw;
 }
 
-bandwidths[node_sl_idx] = final_weight;
+bandwidths[node_sl_idx] = final_weight + 0.5;
   } SMARTLIST_FOREACH_END(node);
 
   log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Revert "Remove an erroneous 0.5 in compute_weighted_bandwidths()"

2017-11-07 Thread nickm

commit 3dc61a5d71423e86d4d8090a90782a1ddf164880
Author: Nick Mathewson 
Date:   Tue Nov 7 20:35:19 2017 -0500

Revert "Remove an erroneous 0.5 in compute_weighted_bandwidths()"

This reverts commit 01e984870a7e1db2722e85fe43af7bcb4755c2d4.
---
 changes/bug23318| 7 ---
 src/or/routerlist.c | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/changes/bug23318 b/changes/bug23318
deleted file mode 100644
index 32c85eb19..0
--- a/changes/bug23318
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (path selection):
-- When selecting relays by bandwidth, avoid a rounding error that
-  could sometimes cause load to be imbalanced incorrectly. Previously,
-  we would always round upwards; now, we round towards the nearest
-  integer.  This had the biggest effect when a relay's weight adjustments
-  should have given it weight 0, but it got weight 1 instead.
-  Fixes bug 23318; bugfix on 0.2.4.3-alpha.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f0bd343f4..c7c109253 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2706,7 +2706,7 @@ compute_weighted_bandwidths(const smartlist_t *sl,
   final_weight = weight*this_bw;
 }
 
-bandwidths[node_sl_idx] = final_weight;
+bandwidths[node_sl_idx] = final_weight + 0.5;
   } SMARTLIST_FOREACH_END(node);
 
   log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Revert "Remove an erroneous 0.5 in compute_weighted_bandwidths()"

2017-11-07 Thread nickm

commit 3dc61a5d71423e86d4d8090a90782a1ddf164880
Author: Nick Mathewson 
Date:   Tue Nov 7 20:35:19 2017 -0500

Revert "Remove an erroneous 0.5 in compute_weighted_bandwidths()"

This reverts commit 01e984870a7e1db2722e85fe43af7bcb4755c2d4.
---
 changes/bug23318| 7 ---
 src/or/routerlist.c | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/changes/bug23318 b/changes/bug23318
deleted file mode 100644
index 32c85eb19..0
--- a/changes/bug23318
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (path selection):
-- When selecting relays by bandwidth, avoid a rounding error that
-  could sometimes cause load to be imbalanced incorrectly. Previously,
-  we would always round upwards; now, we round towards the nearest
-  integer.  This had the biggest effect when a relay's weight adjustments
-  should have given it weight 0, but it got weight 1 instead.
-  Fixes bug 23318; bugfix on 0.2.4.3-alpha.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f0bd343f4..c7c109253 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2706,7 +2706,7 @@ compute_weighted_bandwidths(const smartlist_t *sl,
   final_weight = weight*this_bw;
 }
 
-bandwidths[node_sl_idx] = final_weight;
+bandwidths[node_sl_idx] = final_weight + 0.5;
   } SMARTLIST_FOREACH_END(node);
 
   log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based "

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-11-07 Thread nickm

commit b780e84f256796870857259c16489e90a75a63c7
Merge: ea5ea5f55 3dc61a5d7
Author: Nick Mathewson 
Date:   Tue Nov 7 20:36:04 2017 -0500

Merge branch 'maint-0.3.2'

 changes/bug23318| 7 ---
 src/or/routerlist.c | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-11-07 Thread nickm

commit 059c441d27309d411ed520be293dbf189ab599f4
Merge: 6d6cd2060 3dc61a5d7
Author: Nick Mathewson 
Date:   Tue Nov 7 20:36:04 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug23318| 7 ---
 src/or/routerlist.c | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/maint-7.0] Bug 23396: Updating the msvcr100.dll we ship

2017-11-07 Thread gk

commit 50545b66c03d4fc8fb54b48ee6a34287516d43b7
Author: Georg Koppen 
Date:   Wed Nov 8 07:43:51 2017 +

Bug 23396: Updating the msvcr100.dll we ship

We update the location to get the .dll as well, taking Mike out of the
browser loop.
---
 gitian/fetch-inputs.sh | 4 ++--
 gitian/versions| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 971cd23..6bd5c13 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -132,14 +132,14 @@ do
   fi
 done
 
-for i in OSXSDK MSVCR100
+for i in OSXSDK
 do
   PACKAGE="${i}_PACKAGE"
   URL="${MIRROR_URL}${!PACKAGE}"
   get "${!PACKAGE}" "${MIRROR_URL}${!PACKAGE}"
 done
 
-for i in CCTOOLS
+for i in CCTOOLS MSVCR100
 do
   PACKAGE="${i}_PACKAGE"
   URL="${MIRROR_URL_GK}${!PACKAGE}"
diff --git a/gitian/versions b/gitian/versions
index cc09cb0..f0c1726 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -104,7 +104,7 @@ 
GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 NOSCRIPT_HASH=82687646b9ecc39d478ac5d4de035b32fdf88efc6faceec3e74b49c863bbfabb
 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
-MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
+MSVCR100_HASH=8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-52.4.1esr-7.0-1] Bug 1365047 Turn on the Windows DLL Blocklist in MinGW r=aklotz

2017-11-07 Thread gk

commit 979accc19fb297b0e73c515924d5dfe5c8236be4
Author: Tom Ritter 
Date:   Mon May 15 15:49:20 2017 -0500

Bug 1365047 Turn on the Windows DLL Blocklist in MinGW r=aklotz

MozReview-Commit-ID: 3hF7iOdH89P

--HG--
extra : rebase_source : 95614960544ae55b983dbbd40e1036ff236204b3
---
 mozglue/build/WindowsDllBlocklist.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mozglue/build/WindowsDllBlocklist.h 
b/mozglue/build/WindowsDllBlocklist.h
index 5afe6b8ceee8..82d4a365351f 100644
--- a/mozglue/build/WindowsDllBlocklist.h
+++ b/mozglue/build/WindowsDllBlocklist.h
@@ -6,7 +6,7 @@
 #ifndef mozilla_windowsdllblocklist_h
 #define mozilla_windowsdllblocklist_h
 
-#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
+#if (defined(_MSC_VER) || defined(__MINGW32__))  && (defined(_M_IX86) || 
defined(_M_X64))
 
 #include 
 #include "mozilla/GuardObjects.h"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/maint-7.0] Revert "Apply follow-up patch for bug 24052"

2017-11-07 Thread gk

commit 15c4213ddbfdfe9459291436ba4e4f8cb326e977
Author: Georg Koppen 
Date:   Wed Nov 8 07:46:32 2017 +

Revert "Apply follow-up patch for bug 24052"

This reverts commit a5388a804d47d7d4fb157beb351ebef9897e8a2b. We ship
the patch as usual in the respective tor-browser branch.
---
 gitian/descriptors/linux/gitian-firefox.yml |  2 --
 gitian/descriptors/mac/gitian-firefox.yml   |  2 --
 gitian/patches/24052_2.patch| 29 -
 3 files changed, 33 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-firefox.yml 
b/gitian/descriptors/linux/gitian-firefox.yml
index 967a981..766bf99 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -37,7 +37,6 @@ files:
 - "dzip.sh"
 - "versions"
 - "24052.patch"
-- "24052_2.patch"
 script: |
   source versions
   INSTDIR="$HOME/install"
@@ -91,7 +90,6 @@ script: |
 
   cd tor-browser
   patch -p1 < ../24052.patch
-  patch -p1 < ../24052_2.patch
   # run get-moz-build-date before removing .git, which is used to get the year
   chmod +x ~/build/get-moz-build-date
   eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
diff --git a/gitian/descriptors/mac/gitian-firefox.yml 
b/gitian/descriptors/mac/gitian-firefox.yml
index a38fc0b..f47afc8 100644
--- a/gitian/descriptors/mac/gitian-firefox.yml
+++ b/gitian/descriptors/mac/gitian-firefox.yml
@@ -25,7 +25,6 @@ files:
 - "fix-info-plist.py"
 - "versions"
 - "24052.patch"
-- "24052_2.patch"
 script: |
   INSTDIR="$HOME/install/"
   source versions
@@ -39,7 +38,6 @@ script: |
 
   cd tor-browser
   patch -p1 < ../24052.patch
-  patch -p1 < ../24052_2.patch
   # Extracting all the necessary tools
   tar xaf ../MacOSX10.7.sdk.tar.gz
   tar xaf ../cctools.tar.gz
diff --git a/gitian/patches/24052_2.patch b/gitian/patches/24052_2.patch
deleted file mode 100644
index 0060428..000
--- a/gitian/patches/24052_2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e2c1240ad25f4edcc7d3828b29f6aeb953a24a2e Mon Sep 17 00:00:00 2001
-From: Arthur Edelstein 
-Date: Wed, 1 Nov 2017 02:33:18 -0700
-Subject: [PATCH] Bug 24052: Handle redirects by blocking them early
-
-This is the second part of the workaround for
-https://bugzilla.mozilla.org/show_bug.cgi?id=1412081.
-
-diff --git a/netwerk/protocol/http/nsHttpChannel.cpp 
b/netwerk/protocol/http/nsHttpChannel.cpp
-index 0e570e8cb57d..b38be48bf0c9 100644
 a/netwerk/protocol/http/nsHttpChannel.cpp
-+++ b/netwerk/protocol/http/nsHttpChannel.cpp
-@@ -5419,6 +5419,13 @@ nsHttpChannel::AsyncProcessRedirection(uint32_t 
redirectType)
- return NS_ERROR_CORRUPTED_CONTENT;
- }
- 
-+bool isRedirectToFile = false;
-+rv = mRedirectURI->SchemeIs("file", );
-+if (!NS_FAILED(rv) && isRedirectToFile) {
-+LOG(("Attempted to redirect from a remote page to a file:// URI."));
-+return NS_ERROR_FAILURE;
-+}
-+
- if (mApplicationCache) {
- // if we are redirected to a different origin check if there is a 
fallback
- // cache entry to fall back to. we don't care about file strict
--- 
-2.14.2
-



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/maint-7.0] Revert "Apply patch for bug 24052"

2017-11-07 Thread gk

commit 35f17a0074dd9f0ef3af6079b10300468c2ba8e2
Author: Georg Koppen 
Date:   Wed Nov 8 07:47:14 2017 +

Revert "Apply patch for bug 24052"

This reverts commit f1366de5a2a67dc5fda27718135ee2cff28c344d. We ship
the patch as usual in the respective tor-browser branch.
---
 gitian/descriptors/linux/gitian-firefox.yml |  2 -
 gitian/descriptors/mac/gitian-firefox.yml   |  2 -
 gitian/patches/24052.patch  | 57 -
 3 files changed, 61 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-firefox.yml 
b/gitian/descriptors/linux/gitian-firefox.yml
index 766bf99..1ff66a2 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -36,7 +36,6 @@ files:
 - "re-dzip.sh"
 - "dzip.sh"
 - "versions"
-- "24052.patch"
 script: |
   source versions
   INSTDIR="$HOME/install"
@@ -89,7 +88,6 @@ script: |
   mkdir -p $INSTDIR/Debug/Browser/
 
   cd tor-browser
-  patch -p1 < ../24052.patch
   # run get-moz-build-date before removing .git, which is used to get the year
   chmod +x ~/build/get-moz-build-date
   eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
diff --git a/gitian/descriptors/mac/gitian-firefox.yml 
b/gitian/descriptors/mac/gitian-firefox.yml
index f47afc8..73c46bf 100644
--- a/gitian/descriptors/mac/gitian-firefox.yml
+++ b/gitian/descriptors/mac/gitian-firefox.yml
@@ -24,7 +24,6 @@ files:
 - "dzip.sh"
 - "fix-info-plist.py"
 - "versions"
-- "24052.patch"
 script: |
   INSTDIR="$HOME/install/"
   source versions
@@ -37,7 +36,6 @@ script: |
   mkdir -p $OUTDIR/
 
   cd tor-browser
-  patch -p1 < ../24052.patch
   # Extracting all the necessary tools
   tar xaf ../MacOSX10.7.sdk.tar.gz
   tar xaf ../cctools.tar.gz
diff --git a/gitian/patches/24052.patch b/gitian/patches/24052.patch
deleted file mode 100644
index a418a97..000
--- a/gitian/patches/24052.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c5d1bb91512f9dd20e0f54c6f3e6979588cf9f56 Mon Sep 17 00:00:00 2001
-From: Georg Koppen 
-Date: Fri, 27 Oct 2017 20:40:57 +
-Subject: [PATCH] Bug 24052: Streamline handling of file:// resources
-
-We should make sure restrictions regarding loading of file:// resources
-are adhered to more strictly, at least on *nix platforms.
-
-This is a workaround for
-https://bugzilla.mozilla.org/show_bug.cgi?id=1412081.
-
-diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
-index 0da79c18ae41..0cc67da7b18f 100644
 a/netwerk/base/nsIOService.cpp
-+++ b/netwerk/base/nsIOService.cpp
-@@ -789,12 +789,20 @@ 
nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI,
- // if calling newChannel2() fails we try to fall back to
- // creating a new channel by calling NewChannel().
- if (NS_FAILED(rv)) {
-+#ifdef XP_UNIX
-+if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) {
-+return rv;
-+} else {
-+#endif
- rv = handler->NewChannel(aURI, getter_AddRefs(channel));
- NS_ENSURE_SUCCESS(rv, rv);
- // The protocol handler does not implement NewChannel2, so
- // maybe we need to wrap the channel (see comment in MaybeWrap
- // function).
- channel = nsSecCheckWrapChannel::MaybeWrap(channel, aLoadInfo);
-+#ifdef XP_UNIX
-+}
-+#endif
- }
- }
- 
-diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp 
b/netwerk/protocol/file/nsFileProtocolHandler.cpp
-index e55cb9d47460..c24c928b6f02 100644
 a/netwerk/protocol/file/nsFileProtocolHandler.cpp
-+++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp
-@@ -188,6 +188,13 @@ nsFileProtocolHandler::NewChannel2(nsIURI* uri,
-nsILoadInfo* aLoadInfo,
-nsIChannel** result)
- {
-+#ifdef XP_UNIX
-+if (aLoadInfo && aLoadInfo->TriggeringPrincipal()) {
-+  if (aLoadInfo->TriggeringPrincipal()->GetIsCodebasePrincipal()) {
-+return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST;
-+  }
-+}
-+#endif
- nsFileChannel *chan = new nsFileChannel(uri);
- if (!chan)
- return NS_ERROR_OUT_OF_MEMORY;
--- 
-2.14.2
-

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2017-11-07 Thread translation

commit 29f3b233fcc5658348c045ace7a9ac50ec48eb2b
Author: Translation commit bot 
Date:   Tue Nov 7 13:45:05 2017 +

Update translations for bridgedb
---
 et/LC_MESSAGES/bridgedb.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po
index e963d850c..f16db0406 100644
--- a/et/LC_MESSAGES/bridgedb.po
+++ b/et/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2017-09-20 02:59+\n"
+"PO-Revision-Date: 2017-11-07 13:38+\n"
 "Last-Translator: G \n"
 "Language-Team: Estonian 
(http://www.transifex.com/otf/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2017-11-07 Thread translation

commit a1748d8eb42b1a0aede49c10e9e4e2eef70e616c
Author: Translation commit bot 
Date:   Tue Nov 7 13:45:12 2017 +

Update translations for bridgedb_completed
---
 et/LC_MESSAGES/bridgedb.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po
index e963d850c..f16db0406 100644
--- a/et/LC_MESSAGES/bridgedb.po
+++ b/et/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2017-09-20 02:59+\n"
+"PO-Revision-Date: 2017-11-07 13:38+\n"
 "Last-Translator: G \n"
 "Language-Team: Estonian 
(http://www.transifex.com/otf/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] sr: Don't use a dynamic voting schedule

2017-11-07 Thread nickm

commit 7ee0a2b9aa71693a09687dca431cc1880774f4f4
Author: David Goulet 
Date:   Fri Oct 27 09:16:29 2017 -0400

sr: Don't use a dynamic voting schedule

The exposed get_voting_schedule() allocates and return a new object 
everytime
it is called leading to an awful lot of memory allocation when getting the
start time of the current round which is done for each node in the 
consensus.

Closes #23623

Signed-off-by: David Goulet 
---
 src/or/dirvote.c  | 17 -
 src/or/dirvote.h  |  7 +--
 src/or/shared_random.c|  8 +---
 src/or/shared_random_state.c  | 17 +
 src/or/shared_random_state.h  |  2 +-
 src/test/test_shared_random.c | 17 ++---
 6 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index ddaadb387..6f237e9b2 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2790,7 +2790,7 @@ dirvote_get_start_of_next_interval(time_t now, int 
interval, int offset)
 /* Populate and return a new voting_schedule_t that can be used to schedule
  * voting. The object is allocated on the heap and it's the responsibility of
  * the caller to free it. Can't fail. */
-voting_schedule_t *
+static voting_schedule_t *
 get_voting_schedule(const or_options_t *options, time_t now, int severity)
 {
   int interval, vote_delay, dist_delay;
@@ -2845,7 +2845,7 @@ get_voting_schedule(const or_options_t *options, time_t 
now, int severity)
 
 /** Frees a voting_schedule_t. This should be used instead of the generic
  * tor_free. */
-void
+static void
 voting_schedule_free(voting_schedule_t *voting_schedule_to_free)
 {
   if (!voting_schedule_to_free)
@@ -2857,18 +2857,9 @@ static voting_schedule_t voting_schedule;
 
 /* Using the time now, return the next voting valid-after time. */
 time_t
-get_next_valid_after_time(time_t now)
+dirvote_get_next_valid_after_time(void)
 {
-  time_t next_valid_after_time;
-  const or_options_t *options = get_options();
-  voting_schedule_t *new_voting_schedule =
-get_voting_schedule(options, now, LOG_INFO);
-  tor_assert(new_voting_schedule);
-
-  next_valid_after_time = new_voting_schedule->interval_starts;
-  voting_schedule_free(new_voting_schedule);
-
-  return next_valid_after_time;
+  return voting_schedule.interval_starts;
 }
 
 /** Set voting_schedule to hold the timing for the next vote we should be
diff --git a/src/or/dirvote.h b/src/or/dirvote.h
index fb3e60f00..f8eb52de8 100644
--- a/src/or/dirvote.h
+++ b/src/or/dirvote.h
@@ -170,18 +170,13 @@ typedef struct {
   int have_published_consensus;
 } voting_schedule_t;
 
-voting_schedule_t *get_voting_schedule(const or_options_t *options,
-   time_t now, int severity);
-
-void voting_schedule_free(voting_schedule_t *voting_schedule_to_free);
-
 void dirvote_get_preferred_voting_intervals(vote_timing_t *timing_out);
 time_t dirvote_get_start_of_next_interval(time_t now,
   int interval,
   int offset);
 void dirvote_recalculate_timing(const or_options_t *options, time_t now);
 void dirvote_act(const or_options_t *options, time_t now);
-time_t get_next_valid_after_time(time_t now);
+time_t dirvote_get_next_valid_after_time(void);
 
 /* invoked on timers and by outside triggers. */
 struct pending_vote_t * dirvote_add_vote(const char *vote_body,
diff --git a/src/or/shared_random.c b/src/or/shared_random.c
index bbb7af0a3..b3f62a8fd 100644
--- a/src/or/shared_random.c
+++ b/src/or/shared_random.c
@@ -1333,13 +1333,7 @@ sr_act_post_consensus(const networkstatus_t *consensus)
   }
 
   /* Prepare our state so that it's ready for the next voting period. */
-  {
-voting_schedule_t *voting_schedule =
-  get_voting_schedule(options,time(NULL), LOG_NOTICE);
-time_t interval_starts = voting_schedule->interval_starts;
-sr_state_update(interval_starts);
-voting_schedule_free(voting_schedule);
-  }
+  sr_state_update(dirvote_get_next_valid_after_time());
 }
 
 /* Initialize shared random subsystem. This MUST be called early in the boot
diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c
index f74cb70a1..ae904cfda 100644
--- a/src/or/shared_random_state.c
+++ b/src/or/shared_random_state.c
@@ -139,25 +139,18 @@ get_voting_interval(void)
  * the SR protocol. For example, if it's 23:47:08, the current round thus
  * started at 23:47:00 for a voting interval of 10 seconds. */
 STATIC time_t
-get_start_time_of_current_round(time_t now)
+get_start_time_of_current_round(void)
 {
   const or_options_t *options = get_options();
   int voting_interval = get_voting_interval();
-  voting_schedule_t *new_voting_schedule =
-get_voting_schedule(options, now, LOG_DEBUG);
-  tor_assert(new_voting_schedule);
-
   /* First, get the start time of the next round */
-  time_t next_start =

[tor-commits] [tor/master] Add changes file for #23623.

2017-11-07 Thread nickm

commit 023f62bda474cb52a8a31ba2ae6de95f3e506b18
Author: George Kadianakis 
Date:   Tue Nov 7 00:28:14 2017 +0200

Add changes file for #23623.
---
 changes/bug23623 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/bug23623 b/changes/bug23623
new file mode 100644
index 0..1e2e5c2ac
--- /dev/null
+++ b/changes/bug23623
@@ -0,0 +1,4 @@
+  o Minor bugfixes (onion services):
+- Cache some needed onion service client information instead of
+  continuously computing it over and over again. Fixes bug 23623; bugfix
+  on 0.3.2.1-alpha.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] dirvote: Move code. No behavior change

2017-11-07 Thread nickm

commit 60164f057c4ac5471754f0326ab631448cd7c120
Author: David Goulet 
Date:   Fri Oct 27 09:13:43 2017 -0400

dirvote: Move code. No behavior change

Needed for next commit to address #23623.

Signed-off-by: David Goulet 
---
 src/or/dirvote.c | 76 
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index ba0ab7a77..ddaadb387 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2787,44 +2787,6 @@ dirvote_get_start_of_next_interval(time_t now, int 
interval, int offset)
   return next;
 }
 
-/* Using the time now, return the next voting valid-after time. */
-time_t
-get_next_valid_after_time(time_t now)
-{
-  time_t next_valid_after_time;
-  const or_options_t *options = get_options();
-  voting_schedule_t *new_voting_schedule =
-get_voting_schedule(options, now, LOG_INFO);
-  tor_assert(new_voting_schedule);
-
-  next_valid_after_time = new_voting_schedule->interval_starts;
-  voting_schedule_free(new_voting_schedule);
-
-  return next_valid_after_time;
-}
-
-static voting_schedule_t voting_schedule;
-
-/** Set voting_schedule to hold the timing for the next vote we should be
- * doing. */
-void
-dirvote_recalculate_timing(const or_options_t *options, time_t now)
-{
-  voting_schedule_t *new_voting_schedule;
-
-  if (!authdir_mode_v3(options)) {
-return;
-  }
-
-  /* get the new voting schedule */
-  new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE);
-  tor_assert(new_voting_schedule);
-
-  /* Fill in the global static struct now */
-  memcpy(_schedule, new_voting_schedule, sizeof(voting_schedule));
-  voting_schedule_free(new_voting_schedule);
-}
-
 /* Populate and return a new voting_schedule_t that can be used to schedule
  * voting. The object is allocated on the heap and it's the responsibility of
  * the caller to free it. Can't fail. */
@@ -2891,6 +2853,44 @@ voting_schedule_free(voting_schedule_t 
*voting_schedule_to_free)
   tor_free(voting_schedule_to_free);
 }
 
+static voting_schedule_t voting_schedule;
+
+/* Using the time now, return the next voting valid-after time. */
+time_t
+get_next_valid_after_time(time_t now)
+{
+  time_t next_valid_after_time;
+  const or_options_t *options = get_options();
+  voting_schedule_t *new_voting_schedule =
+get_voting_schedule(options, now, LOG_INFO);
+  tor_assert(new_voting_schedule);
+
+  next_valid_after_time = new_voting_schedule->interval_starts;
+  voting_schedule_free(new_voting_schedule);
+
+  return next_valid_after_time;
+}
+
+/** Set voting_schedule to hold the timing for the next vote we should be
+ * doing. */
+void
+dirvote_recalculate_timing(const or_options_t *options, time_t now)
+{
+  voting_schedule_t *new_voting_schedule;
+
+  if (!authdir_mode_v3(options)) {
+return;
+  }
+
+  /* get the new voting schedule */
+  new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE);
+  tor_assert(new_voting_schedule);
+
+  /* Fill in the global static struct now */
+  memcpy(_schedule, new_voting_schedule, sizeof(voting_schedule));
+  voting_schedule_free(new_voting_schedule);
+}
+
 /** Entry point: Take whatever voting actions are pending as of now. */
 void
 dirvote_act(const or_options_t *options, time_t now)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Make tor recalculate voting schedule even if not a dirauth

2017-11-07 Thread nickm

commit ce99ebf25d3aec18ad840062a949aca4f98c14e6
Author: David Goulet 
Date:   Tue Oct 31 09:54:55 2017 -0400

Make tor recalculate voting schedule even if not a dirauth

Because the HS subsystem needs the voting schedule to compute time period, 
we
need all tor type to do that.

Part of #23623

Signed-off-by: David Goulet 
---
 src/or/dirvote.c | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 6f237e9b2..c5ceefecb 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2863,16 +2863,13 @@ dirvote_get_next_valid_after_time(void)
 }
 
 /** Set voting_schedule to hold the timing for the next vote we should be
- * doing. */
+ * doing. All type of tor do that because HS subsystem needs the timing as
+ * well to function properly. */
 void
 dirvote_recalculate_timing(const or_options_t *options, time_t now)
 {
   voting_schedule_t *new_voting_schedule;
 
-  if (!authdir_mode_v3(options)) {
-return;
-  }
-
   /* get the new voting schedule */
   new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE);
   tor_assert(new_voting_schedule);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] dirvote: Move code. No behavior change

2017-11-07 Thread nickm

commit 60164f057c4ac5471754f0326ab631448cd7c120
Author: David Goulet 
Date:   Fri Oct 27 09:13:43 2017 -0400

dirvote: Move code. No behavior change

Needed for next commit to address #23623.

Signed-off-by: David Goulet 
---
 src/or/dirvote.c | 76 
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index ba0ab7a77..ddaadb387 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2787,44 +2787,6 @@ dirvote_get_start_of_next_interval(time_t now, int 
interval, int offset)
   return next;
 }
 
-/* Using the time now, return the next voting valid-after time. */
-time_t
-get_next_valid_after_time(time_t now)
-{
-  time_t next_valid_after_time;
-  const or_options_t *options = get_options();
-  voting_schedule_t *new_voting_schedule =
-get_voting_schedule(options, now, LOG_INFO);
-  tor_assert(new_voting_schedule);
-
-  next_valid_after_time = new_voting_schedule->interval_starts;
-  voting_schedule_free(new_voting_schedule);
-
-  return next_valid_after_time;
-}
-
-static voting_schedule_t voting_schedule;
-
-/** Set voting_schedule to hold the timing for the next vote we should be
- * doing. */
-void
-dirvote_recalculate_timing(const or_options_t *options, time_t now)
-{
-  voting_schedule_t *new_voting_schedule;
-
-  if (!authdir_mode_v3(options)) {
-return;
-  }
-
-  /* get the new voting schedule */
-  new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE);
-  tor_assert(new_voting_schedule);
-
-  /* Fill in the global static struct now */
-  memcpy(_schedule, new_voting_schedule, sizeof(voting_schedule));
-  voting_schedule_free(new_voting_schedule);
-}
-
 /* Populate and return a new voting_schedule_t that can be used to schedule
  * voting. The object is allocated on the heap and it's the responsibility of
  * the caller to free it. Can't fail. */
@@ -2891,6 +2853,44 @@ voting_schedule_free(voting_schedule_t 
*voting_schedule_to_free)
   tor_free(voting_schedule_to_free);
 }
 
+static voting_schedule_t voting_schedule;
+
+/* Using the time now, return the next voting valid-after time. */
+time_t
+get_next_valid_after_time(time_t now)
+{
+  time_t next_valid_after_time;
+  const or_options_t *options = get_options();
+  voting_schedule_t *new_voting_schedule =
+get_voting_schedule(options, now, LOG_INFO);
+  tor_assert(new_voting_schedule);
+
+  next_valid_after_time = new_voting_schedule->interval_starts;
+  voting_schedule_free(new_voting_schedule);
+
+  return next_valid_after_time;
+}
+
+/** Set voting_schedule to hold the timing for the next vote we should be
+ * doing. */
+void
+dirvote_recalculate_timing(const or_options_t *options, time_t now)
+{
+  voting_schedule_t *new_voting_schedule;
+
+  if (!authdir_mode_v3(options)) {
+return;
+  }
+
+  /* get the new voting schedule */
+  new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE);
+  tor_assert(new_voting_schedule);
+
+  /* Fill in the global static struct now */
+  memcpy(_schedule, new_voting_schedule, sizeof(voting_schedule));
+  voting_schedule_free(new_voting_schedule);
+}
+
 /** Entry point: Take whatever voting actions are pending as of now. */
 void
 dirvote_act(const or_options_t *options, time_t now)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] test: Fix voting schedule for hs_common.c

2017-11-07 Thread nickm

commit 814f4c6967d068f15ace98f78953a5dba0154ee7
Author: David Goulet 
Date:   Tue Oct 31 14:46:21 2017 -0400

test: Fix voting schedule for hs_common.c

Part of #23623

Signed-off-by: David Goulet 
---
 src/test/test_hs_common.c | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 22fed12f1..b435a93e3 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -23,6 +23,7 @@
 #include "config.h"
 #include "networkstatus.h"
 #include "directory.h"
+#include "dirvote.h"
 #include "nodelist.h"
 #include "routerlist.h"
 #include "statefile.h"
@@ -808,26 +809,41 @@ test_time_between_tp_and_srv(void *arg)
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 00:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 01:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 0);
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 11:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 12:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 0);
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 12:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 1);
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 23:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 27 Oct 1985 00:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 1);
 
-  ret = parse_rfc1123_time("Sat, 26 Oct 1985 00:00:00 UTC", _after);
+  ret = parse_rfc1123_time("Sat, 27 Oct 1985 00:00:00 UTC", _after);
+  tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 27 Oct 1985 01:00:00 UTC", _until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 0);
 
@@ -1314,6 +1330,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, 
int num_scenario)
   _service_ns->valid_until);
   set_consensus_times(cfg->service_valid_until,
   _service_ns->fresh_until);
+  dirvote_recalculate_timing(get_options(), mock_service_ns->valid_after);
   /* Set client consensus time. */
   set_consensus_times(cfg->client_valid_after,
   _client_ns->valid_after);
@@ -1321,6 +1338,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, 
int num_scenario)
   _client_ns->valid_until);
   set_consensus_times(cfg->client_valid_until,
   _client_ns->fresh_until);
+  dirvote_recalculate_timing(get_options(), mock_client_ns->valid_after);
 
   /* New time period checks for this scenario. */
   tt_int_op(hs_in_period_between_tp_and_srv(mock_service_ns, 0), OP_EQ,
@@ -1544,6 +1562,7 @@ helper_set_consensus_and_system_time(networkstatus_t *ns, 
int position)
   } else {
 tt_assert(0);
   }
+  dirvote_recalculate_timing(get_options(), ns->valid_after);
 
   /* Set system time: pretend to be just 2 minutes before consensus expiry */
   real_time = ns->valid_until - 120;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-11-07 Thread translation

commit d576a73dcdc6e62aa3c0f2b1ebd10a08fba037f5
Author: Translation commit bot 
Date:   Tue Nov 7 16:20:39 2017 +

Update translations for tor-browser-manual
---
 el/el.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/el/el.po b/el/el.po
index 5959e0094..90ca47b9c 100644
--- a/el/el.po
+++ b/el/el.po
@@ -13,12 +13,13 @@
 # Leonidas P. , 2017
 # Evgenios Kostis , 2017
 # Elektra M. , 2017
+# Sotiris Blad , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Elektra M. , 2017\n"
+"Last-Translator: Sotiris Blad , 2017\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -158,7 +159,7 @@ msgstr ""
 
 #: bridges.page:28
 msgid "Getting bridge addresses"
-msgstr ""
+msgstr "Î£ÏÎ»Î»Î¿Î³Î® Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÏÎ½ Î³ÎµÏÏÏÏÎ½"
 
 #: bridges.page:29
 msgid ""
@@ -186,7 +187,7 @@ msgstr ""
 
 #: bridges.page:51
 msgid "Entering bridge addresses"
-msgstr ""
+msgstr "ÎÎ¹ÏÎ±Î³ÏÎ³Î® Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÏÎ½ Î³ÎµÏÏÏÏÎ½"
 
 #: bridges.page:52
 msgid ""
@@ -299,7 +300,7 @@ msgstr ""
 
 #: circumvention.page:60
 msgid "Which transport should I use?"
-msgstr ""
+msgstr "Î¤Î¹ Î¼ÎÏÎ¿ ÏÏÎÏÎµÎ¹ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÏ;"
 
 #: circumvention.page:61
 msgid ""
@@ -632,7 +633,7 @@ msgstr ""
 
 #: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
-msgstr ""
+msgstr "Î¤Î¿ Tor Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÎ¹ Î³ÎÏÏ
ÏÎµÏ Î±Î½ ÎÏÎµÎ¹ Î¿ÏÎ¹ÏÏÎµÎ¯ proxy."
 
 #: known-issues.page:48
 msgid ""
@@ -733,7 +734,7 @@ msgstr ""
 
 #: managing-identities.page:55
 msgid "Logging in over Tor"
-msgstr ""
+msgstr "Î£ÏÎ½Î´ÎµÏÎ· Î¼ÎÏÏ Tor"
 
 #: managing-identities.page:56
 msgid ""
@@ -870,7 +871,7 @@ msgstr ""
 
 #: onionsites.page:46
 msgid "How to access an onion service"
-msgstr ""
+msgstr "Î ÏÏ Î½Î± ÎÏÏ ÏÏÏÏÎ²Î±ÏÎ· ÏÎµ Î¼Î¹Î± ÏÏÎ·ÏÎµÏÎ¯Î± onion"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -993,7 +994,7 @@ msgstr ""
 
 #: plugins.page:58
 msgid "Browser Add-ons"
-msgstr ""
+msgstr "ÎÏÎµÎºÏÎ¬ÏÎµÎ¹Ï ÏÎµÏÎ¹Î·Î³Î·ÏÎ®"
 
 #: plugins.page:59
 msgid ""
@@ -1371,7 +1372,7 @@ msgstr "Î ÏÏ Î½Î± ÎºÎ±ÏÎ±ÏÎ³Î®ÏÎµÏÎµ ÏÎ¿ Tor 
Browser Î±ÏÏ ÏÎ¿ ÏÏÏÏ
 
 #: uninstalling.page:10
 msgid "Uninstalling"
-msgstr ""
+msgstr "ÎÏÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·"
 
 #: uninstalling.page:12
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Recalculate voting schedule first when getting a new consensus

2017-11-07 Thread nickm

commit 8171d9f50f985de743a415ae5bf61b97e91ce8c8
Author: David Goulet 
Date:   Tue Nov 7 11:08:12 2017 -0500

Recalculate voting schedule first when getting a new consensus

Because the HS and SR subsystems can use the voting schedule early (with the
changes in #23623 making the SR subsystem using the static voting schedule
object), we need to recalculate the schedule very early when setting the new
consensus.

Fixes #24161

Signed-off-by: David Goulet 
---
 src/or/networkstatus.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 93bb8643d..2660e6a32 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1939,13 +1939,17 @@ networkstatus_set_current_consensus(const char 
*consensus,
   }
 
   if (is_usable_flavor) {
+/* The "current" consensus has just been set and it is a usable flavor so
+ * the first thing we need to do is recalculate the voting schedule static
+ * object so we can use the timings in there needed by some subsystems
+ * such as hidden service and shared random. */
+dirvote_recalculate_timing(options, now);
+
 nodelist_set_consensus(c);
 
 /* NM Microdescs: needs a non-ns variant.  NM*/
 update_consensus_networkstatus_fetch_time(now);
 
-dirvote_recalculate_timing(options, now);
-
 /* Update ewma and adjust policy if needed; first cache the old value */
 old_ewma_enabled = cell_ewma_enabled();
 /* Change the cell EWMA settings */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2

2017-11-07 Thread nickm

commit c58471325a48f8181d32d45ef75cd23ffd942181
Merge: c7d1d1ad2 e67f4441e
Author: Nick Mathewson 
Date:   Tue Nov 7 14:00:18 2017 -0500

Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2

 src/or/dirvote.c   | 7 +++
 src/or/networkstatus.c | 8 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2

2017-11-07 Thread nickm

commit c58471325a48f8181d32d45ef75cd23ffd942181
Merge: c7d1d1ad2 e67f4441e
Author: Nick Mathewson 
Date:   Tue Nov 7 14:00:18 2017 -0500

Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2

 src/or/dirvote.c   | 7 +++
 src/or/networkstatus.c | 8 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Add a safe guard to avoid using a zeroed voting schedule

2017-11-07 Thread nickm

commit e67f4441eb2646368e3e7cb1bcee403667b786f0
Author: David Goulet 
Date:   Tue Nov 7 11:14:45 2017 -0500

Add a safe guard to avoid using a zeroed voting schedule

dirvote_get_next_valid_after_time() is the only public function that uses 
the
voting schedule outside of the dirvote subsystem so if it is zeroed,
recalculate its timing if we can that is if a consensus exists.

Part of #24161

Signed-off-by: David Goulet 
---
 src/or/dirvote.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index c5ceefecb..33e5ea7d5 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2859,6 +2859,13 @@ static voting_schedule_t voting_schedule;
 time_t
 dirvote_get_next_valid_after_time(void)
 {
+  /* This is a safe guard in order to make sure that the voting schedule
+   * static object is at least initialized. Using this function with a zeroed
+   * voting schedule can lead to bugs. */
+  if (tor_mem_is_zero((const char *) _schedule,
+  sizeof(voting_schedule))) {
+dirvote_recalculate_timing(get_options(), time(NULL));
+  }
   return voting_schedule.interval_starts;
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Recalculate voting schedule first when getting a new consensus

2017-11-07 Thread nickm

commit 8171d9f50f985de743a415ae5bf61b97e91ce8c8
Author: David Goulet 
Date:   Tue Nov 7 11:08:12 2017 -0500

Recalculate voting schedule first when getting a new consensus

Because the HS and SR subsystems can use the voting schedule early (with the
changes in #23623 making the SR subsystem using the static voting schedule
object), we need to recalculate the schedule very early when setting the new
consensus.

Fixes #24161

Signed-off-by: David Goulet 
---
 src/or/networkstatus.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 93bb8643d..2660e6a32 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1939,13 +1939,17 @@ networkstatus_set_current_consensus(const char 
*consensus,
   }
 
   if (is_usable_flavor) {
+/* The "current" consensus has just been set and it is a usable flavor so
+ * the first thing we need to do is recalculate the voting schedule static
+ * object so we can use the timings in there needed by some subsystems
+ * such as hidden service and shared random. */
+dirvote_recalculate_timing(options, now);
+
 nodelist_set_consensus(c);
 
 /* NM Microdescs: needs a non-ns variant.  NM*/
 update_consensus_networkstatus_fetch_time(now);
 
-dirvote_recalculate_timing(options, now);
-
 /* Update ewma and adjust policy if needed; first cache the old value */
 old_ewma_enabled = cell_ewma_enabled();
 /* Change the cell EWMA settings */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add a safe guard to avoid using a zeroed voting schedule

2017-11-07 Thread nickm

commit e67f4441eb2646368e3e7cb1bcee403667b786f0
Author: David Goulet 
Date:   Tue Nov 7 11:14:45 2017 -0500

Add a safe guard to avoid using a zeroed voting schedule

dirvote_get_next_valid_after_time() is the only public function that uses 
the
voting schedule outside of the dirvote subsystem so if it is zeroed,
recalculate its timing if we can that is if a consensus exists.

Part of #24161

Signed-off-by: David Goulet 
---
 src/or/dirvote.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index c5ceefecb..33e5ea7d5 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2859,6 +2859,13 @@ static voting_schedule_t voting_schedule;
 time_t
 dirvote_get_next_valid_after_time(void)
 {
+  /* This is a safe guard in order to make sure that the voting schedule
+   * static object is at least initialized. Using this function with a zeroed
+   * voting schedule can lead to bugs. */
+  if (tor_mem_is_zero((const char *) _schedule,
+  sizeof(voting_schedule))) {
+dirvote_recalculate_timing(get_options(), time(NULL));
+  }
   return voting_schedule.interval_starts;
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Recalculate voting schedule first when getting a new consensus

2017-11-07 Thread nickm

commit 8171d9f50f985de743a415ae5bf61b97e91ce8c8
Author: David Goulet 
Date:   Tue Nov 7 11:08:12 2017 -0500

Recalculate voting schedule first when getting a new consensus

Because the HS and SR subsystems can use the voting schedule early (with the
changes in #23623 making the SR subsystem using the static voting schedule
object), we need to recalculate the schedule very early when setting the new
consensus.

Fixes #24161

Signed-off-by: David Goulet 
---
 src/or/networkstatus.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 93bb8643d..2660e6a32 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1939,13 +1939,17 @@ networkstatus_set_current_consensus(const char 
*consensus,
   }
 
   if (is_usable_flavor) {
+/* The "current" consensus has just been set and it is a usable flavor so
+ * the first thing we need to do is recalculate the voting schedule static
+ * object so we can use the timings in there needed by some subsystems
+ * such as hidden service and shared random. */
+dirvote_recalculate_timing(options, now);
+
 nodelist_set_consensus(c);
 
 /* NM Microdescs: needs a non-ns variant.  NM*/
 update_consensus_networkstatus_fetch_time(now);
 
-dirvote_recalculate_timing(options, now);
-
 /* Update ewma and adjust policy if needed; first cache the old value */
 old_ewma_enabled = cell_ewma_enabled();
 /* Change the cell EWMA settings */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-11-07 Thread nickm

commit ea5ea5f5542b314d3365a09427cf74340b5093e4
Merge: 91e82baa8 c58471325
Author: Nick Mathewson 
Date:   Tue Nov 7 14:01:10 2017 -0500

Merge branch 'maint-0.3.2'

 src/or/dirvote.c   | 7 +++
 src/or/networkstatus.c | 8 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2

2017-11-07 Thread nickm

commit c58471325a48f8181d32d45ef75cd23ffd942181
Merge: c7d1d1ad2 e67f4441e
Author: Nick Mathewson 
Date:   Tue Nov 7 14:00:18 2017 -0500

Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2

 src/or/dirvote.c   | 7 +++
 src/or/networkstatus.c | 8 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Add a safe guard to avoid using a zeroed voting schedule

2017-11-07 Thread nickm

commit e67f4441eb2646368e3e7cb1bcee403667b786f0
Author: David Goulet 
Date:   Tue Nov 7 11:14:45 2017 -0500

Add a safe guard to avoid using a zeroed voting schedule

dirvote_get_next_valid_after_time() is the only public function that uses 
the
voting schedule outside of the dirvote subsystem so if it is zeroed,
recalculate its timing if we can that is if a consensus exists.

Part of #24161

Signed-off-by: David Goulet 
---
 src/or/dirvote.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index c5ceefecb..33e5ea7d5 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2859,6 +2859,13 @@ static voting_schedule_t voting_schedule;
 time_t
 dirvote_get_next_valid_after_time(void)
 {
+  /* This is a safe guard in order to make sure that the voting schedule
+   * static object is at least initialized. Using this function with a zeroed
+   * voting schedule can lead to bugs. */
+  if (tor_mem_is_zero((const char *) _schedule,
+  sizeof(voting_schedule))) {
+dirvote_recalculate_timing(get_options(), time(NULL));
+  }
   return voting_schedule.interval_starts;
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-11-07 Thread nickm

commit 6d6cd2060f375cbd96b448c0bed67169c309cd65
Merge: 0c8eebd90 c58471325
Author: Nick Mathewson 
Date:   Tue Nov 7 14:01:10 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/or/dirvote.c   | 7 +++
 src/or/networkstatus.c | 8 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2017-11-07 Thread translation

commit 3b89d960de4e968ef07f1c61091b2438a7e71170
Author: Translation commit bot 
Date:   Tue Nov 7 13:47:00 2017 +

Update translations for tor-launcher-network-settings
---
 et/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/et/network-settings.dtd b/et/network-settings.dtd
index c4bdb1041..d471080ee 100644
--- a/et/network-settings.dtd
+++ b/et/network-settings.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] sr: Don't use a dynamic voting schedule

2017-11-07 Thread nickm

commit 7ee0a2b9aa71693a09687dca431cc1880774f4f4
Author: David Goulet 
Date:   Fri Oct 27 09:16:29 2017 -0400

sr: Don't use a dynamic voting schedule

The exposed get_voting_schedule() allocates and return a new object 
everytime
it is called leading to an awful lot of memory allocation when getting the
start time of the current round which is done for each node in the 
consensus.

Closes #23623

Signed-off-by: David Goulet 
---
 src/or/dirvote.c  | 17 -
 src/or/dirvote.h  |  7 +--
 src/or/shared_random.c|  8 +---
 src/or/shared_random_state.c  | 17 +
 src/or/shared_random_state.h  |  2 +-
 src/test/test_shared_random.c | 17 ++---
 6 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index ddaadb387..6f237e9b2 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2790,7 +2790,7 @@ dirvote_get_start_of_next_interval(time_t now, int 
interval, int offset)
 /* Populate and return a new voting_schedule_t that can be used to schedule
  * voting. The object is allocated on the heap and it's the responsibility of
  * the caller to free it. Can't fail. */
-voting_schedule_t *
+static voting_schedule_t *
 get_voting_schedule(const or_options_t *options, time_t now, int severity)
 {
   int interval, vote_delay, dist_delay;
@@ -2845,7 +2845,7 @@ get_voting_schedule(const or_options_t *options, time_t 
now, int severity)
 
 /** Frees a voting_schedule_t. This should be used instead of the generic
  * tor_free. */
-void
+static void
 voting_schedule_free(voting_schedule_t *voting_schedule_to_free)
 {
   if (!voting_schedule_to_free)
@@ -2857,18 +2857,9 @@ static voting_schedule_t voting_schedule;
 
 /* Using the time now, return the next voting valid-after time. */
 time_t
-get_next_valid_after_time(time_t now)
+dirvote_get_next_valid_after_time(void)
 {
-  time_t next_valid_after_time;
-  const or_options_t *options = get_options();
-  voting_schedule_t *new_voting_schedule =
-get_voting_schedule(options, now, LOG_INFO);
-  tor_assert(new_voting_schedule);
-
-  next_valid_after_time = new_voting_schedule->interval_starts;
-  voting_schedule_free(new_voting_schedule);
-
-  return next_valid_after_time;
+  return voting_schedule.interval_starts;
 }
 
 /** Set voting_schedule to hold the timing for the next vote we should be
diff --git a/src/or/dirvote.h b/src/or/dirvote.h
index fb3e60f00..f8eb52de8 100644
--- a/src/or/dirvote.h
+++ b/src/or/dirvote.h
@@ -170,18 +170,13 @@ typedef struct {
   int have_published_consensus;
 } voting_schedule_t;
 
-voting_schedule_t *get_voting_schedule(const or_options_t *options,
-   time_t now, int severity);
-
-void voting_schedule_free(voting_schedule_t *voting_schedule_to_free);
-
 void dirvote_get_preferred_voting_intervals(vote_timing_t *timing_out);
 time_t dirvote_get_start_of_next_interval(time_t now,
   int interval,
   int offset);
 void dirvote_recalculate_timing(const or_options_t *options, time_t now);
 void dirvote_act(const or_options_t *options, time_t now);
-time_t get_next_valid_after_time(time_t now);
+time_t dirvote_get_next_valid_after_time(void);
 
 /* invoked on timers and by outside triggers. */
 struct pending_vote_t * dirvote_add_vote(const char *vote_body,
diff --git a/src/or/shared_random.c b/src/or/shared_random.c
index bbb7af0a3..b3f62a8fd 100644
--- a/src/or/shared_random.c
+++ b/src/or/shared_random.c
@@ -1333,13 +1333,7 @@ sr_act_post_consensus(const networkstatus_t *consensus)
   }
 
   /* Prepare our state so that it's ready for the next voting period. */
-  {
-voting_schedule_t *voting_schedule =
-  get_voting_schedule(options,time(NULL), LOG_NOTICE);
-time_t interval_starts = voting_schedule->interval_starts;
-sr_state_update(interval_starts);
-voting_schedule_free(voting_schedule);
-  }
+  sr_state_update(dirvote_get_next_valid_after_time());
 }
 
 /* Initialize shared random subsystem. This MUST be called early in the boot
diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c
index f74cb70a1..ae904cfda 100644
--- a/src/or/shared_random_state.c
+++ b/src/or/shared_random_state.c
@@ -139,25 +139,18 @@ get_voting_interval(void)
  * the SR protocol. For example, if it's 23:47:08, the current round thus
  * started at 23:47:00 for a voting interval of 10 seconds. */
 STATIC time_t
-get_start_time_of_current_round(time_t now)
+get_start_time_of_current_round(void)
 {
   const or_options_t *options = get_options();
   int voting_interval = get_voting_interval();
-  voting_schedule_t *new_voting_schedule =
-get_voting_schedule(options, now, LOG_DEBUG);
-  tor_assert(new_voting_schedule);
-
   /* First, get the start time of the next round */
-  time_t next_start =

[tor-commits] [tor/maint-0.3.2] dirvote: Move code. No behavior change

2017-11-07 Thread nickm

commit 60164f057c4ac5471754f0326ab631448cd7c120
Author: David Goulet 
Date:   Fri Oct 27 09:13:43 2017 -0400

dirvote: Move code. No behavior change

Needed for next commit to address #23623.

Signed-off-by: David Goulet 
---
 src/or/dirvote.c | 76 
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index ba0ab7a77..ddaadb387 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2787,44 +2787,6 @@ dirvote_get_start_of_next_interval(time_t now, int 
interval, int offset)
   return next;
 }
 
-/* Using the time now, return the next voting valid-after time. */
-time_t
-get_next_valid_after_time(time_t now)
-{
-  time_t next_valid_after_time;
-  const or_options_t *options = get_options();
-  voting_schedule_t *new_voting_schedule =
-get_voting_schedule(options, now, LOG_INFO);
-  tor_assert(new_voting_schedule);
-
-  next_valid_after_time = new_voting_schedule->interval_starts;
-  voting_schedule_free(new_voting_schedule);
-
-  return next_valid_after_time;
-}
-
-static voting_schedule_t voting_schedule;
-
-/** Set voting_schedule to hold the timing for the next vote we should be
- * doing. */
-void
-dirvote_recalculate_timing(const or_options_t *options, time_t now)
-{
-  voting_schedule_t *new_voting_schedule;
-
-  if (!authdir_mode_v3(options)) {
-return;
-  }
-
-  /* get the new voting schedule */
-  new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE);
-  tor_assert(new_voting_schedule);
-
-  /* Fill in the global static struct now */
-  memcpy(_schedule, new_voting_schedule, sizeof(voting_schedule));
-  voting_schedule_free(new_voting_schedule);
-}
-
 /* Populate and return a new voting_schedule_t that can be used to schedule
  * voting. The object is allocated on the heap and it's the responsibility of
  * the caller to free it. Can't fail. */
@@ -2891,6 +2853,44 @@ voting_schedule_free(voting_schedule_t 
*voting_schedule_to_free)
   tor_free(voting_schedule_to_free);
 }
 
+static voting_schedule_t voting_schedule;
+
+/* Using the time now, return the next voting valid-after time. */
+time_t
+get_next_valid_after_time(time_t now)
+{
+  time_t next_valid_after_time;
+  const or_options_t *options = get_options();
+  voting_schedule_t *new_voting_schedule =
+get_voting_schedule(options, now, LOG_INFO);
+  tor_assert(new_voting_schedule);
+
+  next_valid_after_time = new_voting_schedule->interval_starts;
+  voting_schedule_free(new_voting_schedule);
+
+  return next_valid_after_time;
+}
+
+/** Set voting_schedule to hold the timing for the next vote we should be
+ * doing. */
+void
+dirvote_recalculate_timing(const or_options_t *options, time_t now)
+{
+  voting_schedule_t *new_voting_schedule;
+
+  if (!authdir_mode_v3(options)) {
+return;
+  }
+
+  /* get the new voting schedule */
+  new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE);
+  tor_assert(new_voting_schedule);
+
+  /* Fill in the global static struct now */
+  memcpy(_schedule, new_voting_schedule, sizeof(voting_schedule));
+  voting_schedule_free(new_voting_schedule);
+}
+
 /** Entry point: Take whatever voting actions are pending as of now. */
 void
 dirvote_act(const or_options_t *options, time_t now)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] test: Initialize the voting schedule in test_dir.c

2017-11-07 Thread nickm

commit 33da5d7672dc7ac13ce2093a5789fb6bc48e4f86
Author: David Goulet 
Date:   Tue Oct 31 14:07:41 2017 -0400

test: Initialize the voting schedule in test_dir.c

Signed-off-by: David Goulet 
---
 src/test/test_dir.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index b920655db..87b86c38b 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -2379,6 +2379,7 @@ test_a_networkstatus(
   sign_skey_2 = crypto_pk_new();
   sign_skey_3 = crypto_pk_new();
   sign_skey_leg1 = pk_generate(4);
+  dirvote_recalculate_timing(get_options(), now);
   sr_state_init(0, 0);
 
   tt_assert(!crypto_pk_read_private_key_from_string(sign_skey_1,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] test: Fix voting schedule for shared random

2017-11-07 Thread nickm

commit 19d32fd0d643117cc809bafb1a68d1e004d806f3
Author: David Goulet 
Date:   Tue Oct 31 14:39:27 2017 -0400

test: Fix voting schedule for shared random

Part of #23623

Signed-off-by: David Goulet 
---
 src/test/test_shared_random.c | 142 ++
 1 file changed, 60 insertions(+), 82 deletions(-)

diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index d9daa26ce..cac78baec 100644
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -131,7 +131,15 @@ test_get_sr_protocol_phase(void *arg)
   ;
 }
 
-static networkstatus_t *mock_consensus = NULL;
+static networkstatus_t mock_consensus;
+
+/* Mock function to immediately return our local 'mock_consensus'. */
+static networkstatus_t *
+mock_networkstatus_get_live_consensus(time_t now)
+{
+  (void) now;
+  return _consensus;
+}
 
 static void
 test_get_state_valid_until_time(void *arg)
@@ -143,11 +151,23 @@ test_get_state_valid_until_time(void *arg)
 
   (void) arg;
 
+  MOCK(networkstatus_get_live_consensus,
+   mock_networkstatus_get_live_consensus);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC",
+  _consensus.fresh_until);
+  tt_int_op(retval, OP_EQ, 0);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
+  _consensus.valid_after);
+  tt_int_op(retval, OP_EQ, 0);
+
   {
 /* Get the valid until time if called at 00:00:01 */
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:01 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 /* Compare it with the correct result */
@@ -159,6 +179,7 @@ test_get_state_valid_until_time(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 19:22:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 format_iso_time(tbuf, valid_until_time);
@@ -169,6 +190,7 @@ test_get_state_valid_until_time(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 23:59:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 format_iso_time(tbuf, valid_until_time);
@@ -179,6 +201,7 @@ test_get_state_valid_until_time(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 format_iso_time(tbuf, valid_until_time);
@@ -186,7 +209,7 @@ test_get_state_valid_until_time(void *arg)
   }
 
  done:
-  ;
+  UNMOCK(networkstatus_get_live_consensus);
 }
 
 /** Test the function that calculates the start time of the current SRV
@@ -200,11 +223,23 @@ test_get_start_time_of_current_run(void *arg)
 
   (void) arg;
 
+  MOCK(networkstatus_get_live_consensus,
+   mock_networkstatus_get_live_consensus);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC",
+  _consensus.fresh_until);
+  tt_int_op(retval, OP_EQ, 0);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
+  _consensus.valid_after);
+  tt_int_op(retval, OP_EQ, 0);
+
   {
 /* Get start time if called at 00:00:01 */
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:01 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 run_start_time =
   sr_state_get_start_time_of_current_protocol_run(current_time);
 
@@ -217,6 +252,7 @@ test_get_start_time_of_current_run(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 23:59:59 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 run_start_time =
   sr_state_get_start_time_of_current_protocol_run(current_time);
 
@@ -229,6 +265,7 @@ test_get_start_time_of_current_run(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 run_start_time =
   sr_state_get_start_time_of_current_protocol_run(current_time);
 
@@ -237,6 +274,10 @@ test_get_start_time_of_current_run(void *arg)
 tt_str_op("2015-04-20 00:00:00", OP_EQ, tbuf);
   }
 
+  /* Next test is testing it without a consensus to use the testing voting
+   * interval . */
+

[tor-commits] [tor/master] test: Initialize the voting schedule in test_dir.c

2017-11-07 Thread nickm

commit 33da5d7672dc7ac13ce2093a5789fb6bc48e4f86
Author: David Goulet 
Date:   Tue Oct 31 14:07:41 2017 -0400

test: Initialize the voting schedule in test_dir.c

Signed-off-by: David Goulet 
---
 src/test/test_dir.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index b920655db..87b86c38b 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -2379,6 +2379,7 @@ test_a_networkstatus(
   sign_skey_2 = crypto_pk_new();
   sign_skey_3 = crypto_pk_new();
   sign_skey_leg1 = pk_generate(4);
+  dirvote_recalculate_timing(get_options(), now);
   sr_state_init(0, 0);
 
   tt_assert(!crypto_pk_read_private_key_from_string(sign_skey_1,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'asn/ticket23623_032_01' into maint-0.3.2

2017-11-07 Thread nickm

commit 9d848ca58a4624df7abae298d8977ae82bcfb543
Merge: 7d767706e 023f62bda
Author: Nick Mathewson 
Date:   Tue Nov 7 09:58:42 2017 -0500

Merge remote-tracking branch 'asn/ticket23623_032_01' into maint-0.3.2

 changes/bug23623  |   4 ++
 src/or/dirvote.c  |  68 ---
 src/or/dirvote.h  |   7 +-
 src/or/shared_random.c|   8 +--
 src/or/shared_random_state.c  |  17 ++---
 src/or/shared_random_state.h  |   2 +-
 src/test/test_dir.c   |   1 +
 src/test/test_hs_common.c |  21 +-
 src/test/test_hs_service.c|   4 ++
 src/test/test_shared_random.c | 149 +-
 10 files changed, 126 insertions(+), 155 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] test: Fix voting schedule for shared random

2017-11-07 Thread nickm

commit 19d32fd0d643117cc809bafb1a68d1e004d806f3
Author: David Goulet 
Date:   Tue Oct 31 14:39:27 2017 -0400

test: Fix voting schedule for shared random

Part of #23623

Signed-off-by: David Goulet 
---
 src/test/test_shared_random.c | 142 ++
 1 file changed, 60 insertions(+), 82 deletions(-)

diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index d9daa26ce..cac78baec 100644
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -131,7 +131,15 @@ test_get_sr_protocol_phase(void *arg)
   ;
 }
 
-static networkstatus_t *mock_consensus = NULL;
+static networkstatus_t mock_consensus;
+
+/* Mock function to immediately return our local 'mock_consensus'. */
+static networkstatus_t *
+mock_networkstatus_get_live_consensus(time_t now)
+{
+  (void) now;
+  return _consensus;
+}
 
 static void
 test_get_state_valid_until_time(void *arg)
@@ -143,11 +151,23 @@ test_get_state_valid_until_time(void *arg)
 
   (void) arg;
 
+  MOCK(networkstatus_get_live_consensus,
+   mock_networkstatus_get_live_consensus);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC",
+  _consensus.fresh_until);
+  tt_int_op(retval, OP_EQ, 0);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
+  _consensus.valid_after);
+  tt_int_op(retval, OP_EQ, 0);
+
   {
 /* Get the valid until time if called at 00:00:01 */
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:01 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 /* Compare it with the correct result */
@@ -159,6 +179,7 @@ test_get_state_valid_until_time(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 19:22:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 format_iso_time(tbuf, valid_until_time);
@@ -169,6 +190,7 @@ test_get_state_valid_until_time(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 23:59:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 format_iso_time(tbuf, valid_until_time);
@@ -179,6 +201,7 @@ test_get_state_valid_until_time(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 valid_until_time = get_state_valid_until_time(current_time);
 
 format_iso_time(tbuf, valid_until_time);
@@ -186,7 +209,7 @@ test_get_state_valid_until_time(void *arg)
   }
 
  done:
-  ;
+  UNMOCK(networkstatus_get_live_consensus);
 }
 
 /** Test the function that calculates the start time of the current SRV
@@ -200,11 +223,23 @@ test_get_start_time_of_current_run(void *arg)
 
   (void) arg;
 
+  MOCK(networkstatus_get_live_consensus,
+   mock_networkstatus_get_live_consensus);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC",
+  _consensus.fresh_until);
+  tt_int_op(retval, OP_EQ, 0);
+
+  retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
+  _consensus.valid_after);
+  tt_int_op(retval, OP_EQ, 0);
+
   {
 /* Get start time if called at 00:00:01 */
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:01 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 run_start_time =
   sr_state_get_start_time_of_current_protocol_run(current_time);
 
@@ -217,6 +252,7 @@ test_get_start_time_of_current_run(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 23:59:59 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 run_start_time =
   sr_state_get_start_time_of_current_protocol_run(current_time);
 
@@ -229,6 +265,7 @@ test_get_start_time_of_current_run(void *arg)
 retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
 _time);
 tt_int_op(retval, OP_EQ, 0);
+dirvote_recalculate_timing(get_options(), current_time);
 run_start_time =
   sr_state_get_start_time_of_current_protocol_run(current_time);
 
@@ -237,6 +274,10 @@ test_get_start_time_of_current_run(void *arg)
 tt_str_op("2015-04-20 00:00:00", OP_EQ, tbuf);
   }
 
+  /* Next test is testing it without a consensus to use the testing voting
+   * interval . */
+

[tor-commits] [tor/maint-0.3.2] Make tor recalculate voting schedule even if not a dirauth

2017-11-07 Thread nickm

commit ce99ebf25d3aec18ad840062a949aca4f98c14e6
Author: David Goulet 
Date:   Tue Oct 31 09:54:55 2017 -0400

Make tor recalculate voting schedule even if not a dirauth

Because the HS subsystem needs the voting schedule to compute time period, 
we
need all tor type to do that.

Part of #23623

Signed-off-by: David Goulet 
---
 src/or/dirvote.c | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 6f237e9b2..c5ceefecb 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2863,16 +2863,13 @@ dirvote_get_next_valid_after_time(void)
 }
 
 /** Set voting_schedule to hold the timing for the next vote we should be
- * doing. */
+ * doing. All type of tor do that because HS subsystem needs the timing as
+ * well to function properly. */
 void
 dirvote_recalculate_timing(const or_options_t *options, time_t now)
 {
   voting_schedule_t *new_voting_schedule;
 
-  if (!authdir_mode_v3(options)) {
-return;
-  }
-
   /* get the new voting schedule */
   new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE);
   tor_assert(new_voting_schedule);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] sr: Don't use a dynamic voting schedule

2017-11-07 Thread nickm

commit 7ee0a2b9aa71693a09687dca431cc1880774f4f4
Author: David Goulet 
Date:   Fri Oct 27 09:16:29 2017 -0400

sr: Don't use a dynamic voting schedule

The exposed get_voting_schedule() allocates and return a new object 
everytime
it is called leading to an awful lot of memory allocation when getting the
start time of the current round which is done for each node in the 
consensus.

Closes #23623

Signed-off-by: David Goulet 
---
 src/or/dirvote.c  | 17 -
 src/or/dirvote.h  |  7 +--
 src/or/shared_random.c|  8 +---
 src/or/shared_random_state.c  | 17 +
 src/or/shared_random_state.h  |  2 +-
 src/test/test_shared_random.c | 17 ++---
 6 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index ddaadb387..6f237e9b2 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2790,7 +2790,7 @@ dirvote_get_start_of_next_interval(time_t now, int 
interval, int offset)
 /* Populate and return a new voting_schedule_t that can be used to schedule
  * voting. The object is allocated on the heap and it's the responsibility of
  * the caller to free it. Can't fail. */
-voting_schedule_t *
+static voting_schedule_t *
 get_voting_schedule(const or_options_t *options, time_t now, int severity)
 {
   int interval, vote_delay, dist_delay;
@@ -2845,7 +2845,7 @@ get_voting_schedule(const or_options_t *options, time_t 
now, int severity)
 
 /** Frees a voting_schedule_t. This should be used instead of the generic
  * tor_free. */
-void
+static void
 voting_schedule_free(voting_schedule_t *voting_schedule_to_free)
 {
   if (!voting_schedule_to_free)
@@ -2857,18 +2857,9 @@ static voting_schedule_t voting_schedule;
 
 /* Using the time now, return the next voting valid-after time. */
 time_t
-get_next_valid_after_time(time_t now)
+dirvote_get_next_valid_after_time(void)
 {
-  time_t next_valid_after_time;
-  const or_options_t *options = get_options();
-  voting_schedule_t *new_voting_schedule =
-get_voting_schedule(options, now, LOG_INFO);
-  tor_assert(new_voting_schedule);
-
-  next_valid_after_time = new_voting_schedule->interval_starts;
-  voting_schedule_free(new_voting_schedule);
-
-  return next_valid_after_time;
+  return voting_schedule.interval_starts;
 }
 
 /** Set voting_schedule to hold the timing for the next vote we should be
diff --git a/src/or/dirvote.h b/src/or/dirvote.h
index fb3e60f00..f8eb52de8 100644
--- a/src/or/dirvote.h
+++ b/src/or/dirvote.h
@@ -170,18 +170,13 @@ typedef struct {
   int have_published_consensus;
 } voting_schedule_t;
 
-voting_schedule_t *get_voting_schedule(const or_options_t *options,
-   time_t now, int severity);
-
-void voting_schedule_free(voting_schedule_t *voting_schedule_to_free);
-
 void dirvote_get_preferred_voting_intervals(vote_timing_t *timing_out);
 time_t dirvote_get_start_of_next_interval(time_t now,
   int interval,
   int offset);
 void dirvote_recalculate_timing(const or_options_t *options, time_t now);
 void dirvote_act(const or_options_t *options, time_t now);
-time_t get_next_valid_after_time(time_t now);
+time_t dirvote_get_next_valid_after_time(void);
 
 /* invoked on timers and by outside triggers. */
 struct pending_vote_t * dirvote_add_vote(const char *vote_body,
diff --git a/src/or/shared_random.c b/src/or/shared_random.c
index bbb7af0a3..b3f62a8fd 100644
--- a/src/or/shared_random.c
+++ b/src/or/shared_random.c
@@ -1333,13 +1333,7 @@ sr_act_post_consensus(const networkstatus_t *consensus)
   }
 
   /* Prepare our state so that it's ready for the next voting period. */
-  {
-voting_schedule_t *voting_schedule =
-  get_voting_schedule(options,time(NULL), LOG_NOTICE);
-time_t interval_starts = voting_schedule->interval_starts;
-sr_state_update(interval_starts);
-voting_schedule_free(voting_schedule);
-  }
+  sr_state_update(dirvote_get_next_valid_after_time());
 }
 
 /* Initialize shared random subsystem. This MUST be called early in the boot
diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c
index f74cb70a1..ae904cfda 100644
--- a/src/or/shared_random_state.c
+++ b/src/or/shared_random_state.c
@@ -139,25 +139,18 @@ get_voting_interval(void)
  * the SR protocol. For example, if it's 23:47:08, the current round thus
  * started at 23:47:00 for a voting interval of 10 seconds. */
 STATIC time_t
-get_start_time_of_current_round(time_t now)
+get_start_time_of_current_round(void)
 {
   const or_options_t *options = get_options();
   int voting_interval = get_voting_interval();
-  voting_schedule_t *new_voting_schedule =
-get_voting_schedule(options, now, LOG_DEBUG);
-  tor_assert(new_voting_schedule);
-
   /* First, get the start time of the next round */
-  time_t next_start =

[tor-commits] [tor/maint-0.3.2] test: Fix voting schedule for hs_common.c

2017-11-07 Thread nickm

commit 814f4c6967d068f15ace98f78953a5dba0154ee7
Author: David Goulet 
Date:   Tue Oct 31 14:46:21 2017 -0400

test: Fix voting schedule for hs_common.c

Part of #23623

Signed-off-by: David Goulet 
---
 src/test/test_hs_common.c | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 22fed12f1..b435a93e3 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -23,6 +23,7 @@
 #include "config.h"
 #include "networkstatus.h"
 #include "directory.h"
+#include "dirvote.h"
 #include "nodelist.h"
 #include "routerlist.h"
 #include "statefile.h"
@@ -808,26 +809,41 @@ test_time_between_tp_and_srv(void *arg)
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 00:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 01:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 0);
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 11:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 12:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 0);
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 12:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 1);
 
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 23:00:00 UTC", _after);
   tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 27 Oct 1985 00:00:00 UTC", _until);
+  tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 1);
 
-  ret = parse_rfc1123_time("Sat, 26 Oct 1985 00:00:00 UTC", _after);
+  ret = parse_rfc1123_time("Sat, 27 Oct 1985 00:00:00 UTC", _after);
+  tt_int_op(ret, OP_EQ, 0);
+  ret = parse_rfc1123_time("Sat, 27 Oct 1985 01:00:00 UTC", _until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), ns.valid_after);
   ret = hs_in_period_between_tp_and_srv(, 0);
   tt_int_op(ret, OP_EQ, 0);
 
@@ -1314,6 +1330,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, 
int num_scenario)
   _service_ns->valid_until);
   set_consensus_times(cfg->service_valid_until,
   _service_ns->fresh_until);
+  dirvote_recalculate_timing(get_options(), mock_service_ns->valid_after);
   /* Set client consensus time. */
   set_consensus_times(cfg->client_valid_after,
   _client_ns->valid_after);
@@ -1321,6 +1338,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, 
int num_scenario)
   _client_ns->valid_until);
   set_consensus_times(cfg->client_valid_until,
   _client_ns->fresh_until);
+  dirvote_recalculate_timing(get_options(), mock_client_ns->valid_after);
 
   /* New time period checks for this scenario. */
   tt_int_op(hs_in_period_between_tp_and_srv(mock_service_ns, 0), OP_EQ,
@@ -1544,6 +1562,7 @@ helper_set_consensus_and_system_time(networkstatus_t *ns, 
int position)
   } else {
 tt_assert(0);
   }
+  dirvote_recalculate_timing(get_options(), ns->valid_after);
 
   /* Set system time: pretend to be just 2 minutes before consensus expiry */
   real_time = ns->valid_until - 120;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Add changes file for #23623.

2017-11-07 Thread nickm

commit 023f62bda474cb52a8a31ba2ae6de95f3e506b18
Author: George Kadianakis 
Date:   Tue Nov 7 00:28:14 2017 +0200

Add changes file for #23623.
---
 changes/bug23623 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/bug23623 b/changes/bug23623
new file mode 100644
index 0..1e2e5c2ac
--- /dev/null
+++ b/changes/bug23623
@@ -0,0 +1,4 @@
+  o Minor bugfixes (onion services):
+- Cache some needed onion service client information instead of
+  continuously computing it over and over again. Fixes bug 23623; bugfix
+  on 0.3.2.1-alpha.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] test: Fix voting schedule for hs_service.c

2017-11-07 Thread nickm

commit bd631a649b5cfae23fc13be08c72d5c1c0c70174
Author: David Goulet 
Date:   Tue Oct 31 14:48:27 2017 -0400

test: Fix voting schedule for hs_service.c

Part of #23623

Signed-off-by: David Goulet 
---
 src/test/test_hs_service.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 462c860a9..3084c6b95 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -33,6 +33,7 @@
 #include "circuitlist.h"
 #include "circuituse.h"
 #include "crypto.h"
+#include "dirvote.h"
 #include "networkstatus.h"
 #include "nodelist.h"
 #include "relay.h"
@@ -967,6 +968,7 @@ test_rotate_descriptors(void *arg)
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 14:00:00 UTC",
_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), mock_ns.valid_after);
 
   /* Create a service with a default descriptor and state. It's added to the
* global map. */
@@ -1004,6 +1006,7 @@ test_rotate_descriptors(void *arg)
   ret = parse_rfc1123_time("Sat, 27 Oct 1985 02:00:00 UTC",
_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), mock_ns.valid_after);
 
   /* Note down what to expect for the next rotation time which is 01:00 + 23h
* meaning 00:00:00. */
@@ -1065,6 +1068,7 @@ test_build_update_descriptors(void *arg)
   ret = parse_rfc1123_time("Sat, 26 Oct 1985 04:00:00 UTC",
_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
+  dirvote_recalculate_timing(get_options(), mock_ns.valid_after);
 
   /* Create a service without a current descriptor to trigger a build. */
   service = helper_create_service();



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-11-07 Thread translation

commit 19761ff3f40b2dabb17a5fe250e86090d1d09ec6
Author: Translation commit bot 
Date:   Tue Nov 7 13:50:49 2017 +

Update translations for tor-browser-manual
---
 et/et.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/et/et.po b/et/et.po
index e7d656d3f..aefa76bc0 100644
--- a/et/et.po
+++ b/et/et.po
@@ -1,12 +1,13 @@
 # Translators:
 # Georg , 2016
 # Tor Project , 2016
+# Madis , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Tor Project , 
2016\n"
+"Last-Translator: Madis , 2017\n"
 "Language-Team: Estonian (https://www.transifex.com/otf/teams/1519/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -439,7 +440,7 @@ msgstr ""
 
 #: first-time.page:33
 msgid "Configure"
-msgstr ""
+msgstr "HÃ¤Ã¤lesta"
 
 #: first-time.page:37
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-11-07 Thread nickm

commit 89ed93e46818d0c1d1ae47f8848fac752149eef1
Merge: bd432bbac 9d848ca58
Author: Nick Mathewson 
Date:   Tue Nov 7 09:58:53 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug23623  |   4 ++
 src/or/dirvote.c  |  68 ---
 src/or/dirvote.h  |   7 +-
 src/or/shared_random.c|   8 +--
 src/or/shared_random_state.c  |  17 ++---
 src/or/shared_random_state.h  |   2 +-
 src/test/test_dir.c   |   1 +
 src/test/test_hs_common.c |  21 +-
 src/test/test_hs_service.c|   4 ++
 src/test/test_shared_random.c | 149 +-
 10 files changed, 126 insertions(+), 155 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Add changes file for #23623.

2017-11-07 Thread nickm

commit 023f62bda474cb52a8a31ba2ae6de95f3e506b18
Author: George Kadianakis 
Date:   Tue Nov 7 00:28:14 2017 +0200

Add changes file for #23623.
---
 changes/bug23623 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/bug23623 b/changes/bug23623
new file mode 100644
index 0..1e2e5c2ac
--- /dev/null
+++ b/changes/bug23623
@@ -0,0 +1,4 @@
+  o Minor bugfixes (onion services):
+- Cache some needed onion service client information instead of
+  continuously computing it over and over again. Fixes bug 23623; bugfix
+  on 0.3.2.1-alpha.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Replace tor website references of arm with nyx

2017-11-07 Thread atagar

commit 13e6c7b808a20dc6c15721268eb0286684ee8af7
Author: Damian Johnson 
Date:   Tue Nov 7 09:28:47 2017 -0800

Replace tor website references of arm with nyx

Think I got 'em all. Now that Nyx is live we can aggressively start
dereferencing the old name.
---
 about/en/corepeople.wml|   2 +-
 docs/en/tor-relay-debian.wml   |   8 ++--
 en/index.wml   |   6 +--
 getinvolved/en/volunteer.wml   |   2 +-
 images/{icon-Arm.jpg => icon-Nyx.jpg}  | Bin
 ...shot_arm_page1.png => screenshot_nyx_page1.png} | Bin
 ...ropped.png => screenshot_nyx_page1_cropped.png} | Bin
 projects/en/{arm.wml => nyx.wml}   |  48 ++---
 projects/en/projects.wml   |   6 +--
 projects/en/sidenav.wmi|   4 +-
 10 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index f1f4d6cf..35270cf6 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -196,7 +196,7 @@ table.people tr td:first-child {
   https://db.torproject.org/fetchkey.cgi?fingerprint=68278CC5DD2D1E85C4E45AD90445B7AB9ABBEEC6;>
   Damian Johnson
   IRC: atagar
-  Author of the https://stem.torproject.org/;>Stem python controller library and https://www.atagar.com/arm/;>Nyx relay monitor.
+  Author of the https://stem.torproject.org/;>Stem python controller library and https://nyx.torproject.org/;>Nyx relay monitor.
 
   
 
diff --git a/docs/en/tor-relay-debian.wml b/docs/en/tor-relay-debian.wml
index e55e51c8..10bebc7c 100644
--- a/docs/en/tor-relay-debian.wml
+++ b/docs/en/tor-relay-debian.wml
@@ -168,12 +168,12 @@ href="/doc/TorExitGuidelines">guidelines
 
 
 13. You might like to use the https://www.atagar.com/arm/;>arm relay monitor to watch
-your relay's activities from the command line. First, "sudo apt
-install tor-arm". Second, as the user that will be running arm, run
+href="https://nyx.torproject.org/;>Nyx relay monitor to watch
+your relay's activities from the command line. First, "sudo pip install
+nyx". Second, as the user that will be running nyx, run
 "sudo adduser $USER debian-tor" to add your user to the debian-tor
 group so it can reach Tor's controlsocket. Then log out and log back
-in (so your user is actually in the group), and run "arm".
+in (so your user is actually in the group), and run "nyx".
 
 
 
diff --git a/en/index.wml b/en/index.wml
index 5c166f10..24f55b53 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -91,9 +91,9 @@
   -->
   
 
-https://www.atagar.com/arm/;>
-https://www.atagar.com/arm/;>Arm
+https://nyx.torproject.org/;>
+https://nyx.torproject.org/;>Nyx
 Terminal (command line) application for monitoring
 and configuring Tor.
 
diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 206dbec9..f9b77670 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -423,7 +423,7 @@ meetings around the world.
 
 
 
-https://www.atagar.com/arm/;>Nyx (https://nyx.torproject.org/;>Nyx (https://gitweb.torproject.org/nyx.git;>code, https://trac.torproject.org/projects/tor/query?status=accepted=assigned=needs_review=new=reopened=Core+Tor%2FNyx=priority;>bug
 tracker)
diff --git a/images/icon-Arm.jpg b/images/icon-Nyx.jpg
similarity index 100%
rename from images/icon-Arm.jpg
rename to images/icon-Nyx.jpg
diff --git a/images/screenshot_arm_page1.png b/images/screenshot_nyx_page1.png
similarity index 100%
rename from images/screenshot_arm_page1.png
rename to images/screenshot_nyx_page1.png
diff --git a/images/screenshot_arm_page1_cropped.png 
b/images/screenshot_nyx_page1_cropped.png
similarity index 100%
rename from images/screenshot_arm_page1_cropped.png
rename to images/screenshot_nyx_page1_cropped.png
diff --git a/projects/en/arm.wml b/projects/en/nyx.wml
similarity index 52%
rename from projects/en/arm.wml
rename to projects/en/nyx.wml
index 47a406a7..28b3d1aa 100644
--- a/projects/en/arm.wml
+++ b/projects/en/nyx.wml
@@ -2,56 +2,54 @@
 # Revision: $Revision$
 # Translation-Priority: 4-optional
 
-#include "head.wmi" TITLE="Tor Project: Arm" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor Project: Nyx" CHARSET="UTF-8"
 

 Home  
 Projects  
-Arm  
+Nyx  
   
-
+   
 
-
-Arm (https://www.atagar.com/arm/;>Project Page)
+
+Nyx (https://nyx.torproject.org/;>Project Page)
 
-
+
 
 
-https://www.atagar.com/arm/screenshots.php;>
+https://nyx.torproject.org/;>
 
 
-
+
 
-The anonymizing relay monitor (arm) is a CLI status monitor for Tor. This
-functions much like top does

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-11-07 Thread nickm

commit 91e82baa8d82e147e490922d5447596cdc621054
Merge: c6c4a421f c7d1d1ad2
Author: Nick Mathewson 
Date:   Tue Nov 7 13:22:37 2017 -0500

Merge branch 'maint-0.3.2'

"ours" merge to avoid version bump.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Bump to 0.3.2.4-alpha

2017-11-07 Thread nickm

commit c7d1d1ad2e398e92a6839f61df310557b3ca44ba
Author: Nick Mathewson 
Date:   Tue Nov 7 13:22:27 2017 -0500

Bump to 0.3.2.4-alpha
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 592e04a5d..f1e512c2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.2.3-alpha-dev])
+AC_INIT([tor],[0.3.2.4-alpha])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4c1f709a2..25c3378f3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.2.3-alpha-dev"
+!define VERSION "0.3.2.4-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 38c6d5118..eebe97c44 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.2.3-alpha-dev"
+#define VERSION "0.3.2.4-alpha"
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-11-07 Thread nickm

commit 0c8eebd90c5e745bb60339bea6fee79f19d0d6fd
Merge: 89ed93e46 c7d1d1ad2
Author: Nick Mathewson 
Date:   Tue Nov 7 13:22:47 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Bump to 0.3.2.4-alpha

2017-11-07 Thread nickm

commit c7d1d1ad2e398e92a6839f61df310557b3ca44ba
Author: Nick Mathewson 
Date:   Tue Nov 7 13:22:27 2017 -0500

Bump to 0.3.2.4-alpha
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 592e04a5d..f1e512c2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.2.3-alpha-dev])
+AC_INIT([tor],[0.3.2.4-alpha])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4c1f709a2..25c3378f3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.2.3-alpha-dev"
+!define VERSION "0.3.2.4-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 38c6d5118..eebe97c44 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.2.3-alpha-dev"
+#define VERSION "0.3.2.4-alpha"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Bump to 0.3.2.4-alpha

2017-11-07 Thread nickm

commit c7d1d1ad2e398e92a6839f61df310557b3ca44ba
Author: Nick Mathewson 
Date:   Tue Nov 7 13:22:27 2017 -0500

Bump to 0.3.2.4-alpha
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 592e04a5d..f1e512c2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.2.3-alpha-dev])
+AC_INIT([tor],[0.3.2.4-alpha])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4c1f709a2..25c3378f3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.2.3-alpha-dev"
+!define VERSION "0.3.2.4-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 38c6d5118..eebe97c44 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.2.3-alpha-dev"
+#define VERSION "0.3.2.4-alpha"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2017-11-07 Thread translation

commit 5e917d7feb54d6cc0cb25ffadc2fe3620e323771
Author: Translation commit bot 
Date:   Tue Nov 7 16:48:40 2017 +

Update translations for torbutton-abouttorproperties_completed
---
 pt_BR/abouttor.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/abouttor.properties b/pt_BR/abouttor.properties
index ca749aa98..44b73037a 100644
--- a/pt_BR/abouttor.properties
+++ b/pt_BR/abouttor.properties
@@ -10,8 +10,8 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
 aboutTor.donationBanner.donate=FaÃ§a uma DoaÃ§Ã£o Agora!
 
-aboutTor.donationBanner.slogan=Tor: Desligando a ResistÃªncia Digital 
-aboutTor.donationBanner.mozilla=FaÃ§a uma doaÃ§Ã£o hoje e a Mozilla vai doarÃ¡ 
em dobro!
+aboutTor.donationBanner.slogan=Tor: Fortalecendo a ResistÃªncia Digital 
+aboutTor.donationBanner.mozilla=FaÃ§a uma doaÃ§Ã£o hoje e a Mozilla doarÃ¡ em 
dobro!
 
 aboutTor.donationBanner.tagline1=Protegendo Jornalistas, Whistleblowers e 
Ativistas desde 2006
 aboutTor.donationBanner.tagline2=Construindo Redes de Liberdade no Mundo Todo

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2017-11-07 Thread translation

commit 2c902867e13cd6d81b2d102780066fe400bef0c3
Author: Translation commit bot 
Date:   Tue Nov 7 16:48:35 2017 +

Update translations for torbutton-abouttorproperties
---
 pt_BR/abouttor.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/abouttor.properties b/pt_BR/abouttor.properties
index ca749aa98..44b73037a 100644
--- a/pt_BR/abouttor.properties
+++ b/pt_BR/abouttor.properties
@@ -10,8 +10,8 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
 aboutTor.donationBanner.donate=FaÃ§a uma DoaÃ§Ã£o Agora!
 
-aboutTor.donationBanner.slogan=Tor: Desligando a ResistÃªncia Digital 
-aboutTor.donationBanner.mozilla=FaÃ§a uma doaÃ§Ã£o hoje e a Mozilla vai doarÃ¡ 
em dobro!
+aboutTor.donationBanner.slogan=Tor: Fortalecendo a ResistÃªncia Digital 
+aboutTor.donationBanner.mozilla=FaÃ§a uma doaÃ§Ã£o hoje e a Mozilla doarÃ¡ em 
dobro!
 
 aboutTor.donationBanner.tagline1=Protegendo Jornalistas, Whistleblowers e 
Ativistas desde 2006
 aboutTor.donationBanner.tagline2=Construindo Redes de Liberdade no Mundo Todo

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [nyx/master] Update link for the pypi tarball

2017-11-07 Thread atagar

commit 855de93b684162e5bca8e59b798c5e57fa4e7767
Author: Damian Johnson 
Date:   Tue Nov 7 08:55:35 2017 -0800

Update link for the pypi tarball
---
 web/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/index.html b/web/index.html
index 2ecb239..811e9e4 100644
--- a/web/index.html
+++ b/web/index.html
@@ -335,7 +335,7 @@ sudo python setup.py install
   
 https://pypi.python.org/pypi/nyx/; id="pypi">
 https://pypi.python.org/pypi/nyx/; 
class="platform-title">Python Package Index
-Signed releases and instructions for both Python 2.x and 3.x. You 
can easily install from its https://www.atagar.com/arm/resources/static/arm-1.4.5.0.tar.bz2;>tarball
 (https://www.atagar.com/arm/resources/static/arm-1.4.5.0.tar.bz2.asc;>sig),
 or with pip...
+Signed releases and instructions for both Python 2.x and 3.x. You 
can easily install from its https://pypi.python.org/packages/42/37/85890dae5680f36f5b1c964ad41674ebb8d1186383fbca58f82e76de734c/nyx-2.0.4.tar.gz;>tarball
 (https://pypi.python.org/packages/42/37/85890dae5680f36f5b1c964ad41674ebb8d1186383fbca58f82e76de734c/nyx-2.0.4.tar.gz.asc;>sig),
 or with pip...
 
 % sudo easy_install pip
 % sudo pip install nyx

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [nyx/master] Drop old arm packages from the download page

2017-11-07 Thread atagar

commit 37db1aa164b9b59de52fbc5be6915e0c6e7b8698
Author: Damian Johnson 
Date:   Tue Nov 7 08:52:15 2017 -0800

Drop old arm packages from the download page

To cut down on confusion we should stop listing alternate platforms until 
our
package maintainers have a chance to package the new nyx codebase for those
platforms.
---
 web/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/index.html b/web/index.html
index 72b098c..2ecb239 100644
--- a/web/index.html
+++ b/web/index.html
@@ -352,6 +352,7 @@ sudo python setup.py install
 
   
 
+  
 
   
 https://gitweb.torproject.org/nyx.git; id="git">



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Update link for the pypi tarball

2017-11-07 Thread atagar

commit 291f408d5a912db27cb6c6f4c039ea5dc81a9459
Author: Damian Johnson 
Date:   Tue Nov 7 08:56:58 2017 -0800

Update link for the pypi tarball
---
 docs/download.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/download.rst b/docs/download.rst
index c853f1d2..9fbdf238 100644
--- a/docs/download.rst
+++ b/docs/download.rst
@@ -71,9 +71,9 @@ Download
 
Signed releases and instructions for both Python 2.x and 3.x. You can
easily install from its `tarball
-   
`_
+   
`_
(`sig
-   
`_),
+   
`_),
or with **pip**...
 
::

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Merge remote-tracking branch 'asn/ticket24118_01'

2017-11-07 Thread nickm

commit 9485b1b3fe580c2840da9a1d53148afc20347419
Merge: bbb6d34 b927962
Author: Nick Mathewson 
Date:   Tue Nov 7 14:28:23 2017 -0500

Merge remote-tracking branch 'asn/ticket24118_01'

 dir-spec.txt | 19 +++
 1 file changed, 19 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] dir-spec: Document HS v3 consensus params

2017-11-07 Thread nickm

commit 19e99a118056e30e9a304db2dfcaa83af3d0a6bc
Author: David Goulet 
Date:   Wed Nov 1 14:32:53 2017 -0400

dir-spec: Document HS v3 consensus params

Signed-off-by: David Goulet 
---
 dir-spec.txt | 20 
 1 file changed, 20 insertions(+)

diff --git a/dir-spec.txt b/dir-spec.txt
index ffbe4d3..3e4afe9 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1966,6 +1966,26 @@
 days after it is replaced.  (Introduced in 0.3.1.1-alpha;
 prior versions of tor hardcoded both of these values to 7 days.)
 
+Hidden service v3 parameters:
+ "hs_intro_min_introduce2" -- Minimum amount of INTRODUCE2 cells
+  allowed per circuits before rotation.
+ "hs_intro_max_introduce2" -- Maximum amount of INTRODUCE2 cells
+  allowed per circuits before rotation.
+ "hs_intro_min_lifetime" -- Minimum lifetime in seconds that a service
+should keep an intro point for.
+ "hs_intro_max_lifetime" -- Maximum lifetime in seconds that a service
+should keep an intro point for.
+ "hs_intro_num_extra" -- Number of extra intro point a service is
+ allowed to open. This concept comes from
+ proposal #155.
+ "hsdir_interval" -- The length of a time period. See rend-spec-v3.txt
+ section [TIME-PERIODS].
+ "hsdir_n_replicas" -- Number of HSDir replica.
+ "hsdir_spread_fetch" -- Total number of HSDir per replica a tor client
+ should select to try to fetch a descriptor.
+ "hsdir_spread_store" -- Total number of HSDir per replica a service
+ will upload its descriptor to.
+
 "shared-rand-previous-value" SP NumReveals SP Value NL
 
 [At most once]



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] fixup! dir-spec: Document HS v3 consensus params

2017-11-07 Thread nickm

commit b927962b3cc895044682e6325fe260662b5b6f5d
Author: George Kadianakis 
Date:   Fri Nov 3 16:27:10 2017 +0200

fixup! dir-spec: Document HS v3 consensus params
---
 dir-spec.txt | 35 +--
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index 3e4afe9..ded23eb 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1967,24 +1967,23 @@
 prior versions of tor hardcoded both of these values to 7 days.)
 
 Hidden service v3 parameters:
- "hs_intro_min_introduce2" -- Minimum amount of INTRODUCE2 cells
-  allowed per circuits before rotation.
- "hs_intro_max_introduce2" -- Maximum amount of INTRODUCE2 cells
-  allowed per circuits before rotation.
- "hs_intro_min_lifetime" -- Minimum lifetime in seconds that a service
-should keep an intro point for.
- "hs_intro_max_lifetime" -- Maximum lifetime in seconds that a service
-should keep an intro point for.
- "hs_intro_num_extra" -- Number of extra intro point a service is
- allowed to open. This concept comes from
- proposal #155.
- "hsdir_interval" -- The length of a time period. See rend-spec-v3.txt
- section [TIME-PERIODS].
- "hsdir_n_replicas" -- Number of HSDir replica.
- "hsdir_spread_fetch" -- Total number of HSDir per replica a tor client
- should select to try to fetch a descriptor.
- "hsdir_spread_store" -- Total number of HSDir per replica a service
- will upload its descriptor to.
+ "hs_intro_min_introduce2"
+ "hs_intro_max_introduce2" -- Minimum/maximum amount of INTRODUCE2 
cells
+  allowed per circuits before rotation 
(actual
+  amount picked at random between these 
two values).
+ "hs_intro_min_lifetime"
+ "hs_intro_max_lifetime"   -- Minimum/maximum lifetime in seconds that 
a service
+  should keep an intro point for (actual 
lifetime picked at
+  random between these two values).
+ "hs_intro_num_extra"  -- Number of extra intro points a service 
is allowed to open.
+  This concept comes from proposal #155.
+ "hsdir_interval"  -- The length of a time period. See 
rend-spec-v3.txt
+  section [TIME-PERIODS].
+ "hsdir_n_replicas"-- Number of HS descriptor replicas.
+ "hsdir_spread_fetch"  -- Total number of HSDirs per replica a tor 
client
+  should select to try to fetch a 
descriptor.
+ "hsdir_spread_store"  -- Total number of HSDirs per replica a 
service
+  will upload its descriptor to.
 
 "shared-rand-previous-value" SP NumReveals SP Value NL
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] prop284: dos2unix the proposal

2017-11-07 Thread dgoulet

commit 9a53e606a00233e433e2fa9ddad3b5ad49432fe2
Author: David Goulet 
Date:   Tue Nov 7 14:48:35 2017 -0500

prop284: dos2unix the proposal

Signed-off-by: David Goulet 
---
 proposals/284-hsv3-control-port.txt | 336 ++--
 1 file changed, 168 insertions(+), 168 deletions(-)

diff --git a/proposals/284-hsv3-control-port.txt 
b/proposals/284-hsv3-control-port.txt
index 0bee081..f2d03f6 100644
--- a/proposals/284-hsv3-control-port.txt
+++ b/proposals/284-hsv3-control-port.txt
@@ -1,168 +1,168 @@
-Filename: 284-hsv3-control-port.txt
-Title: Hidden Service v3 Control Port
-Author: David Goulet
-Created: 02-November-2017
-Status: Open
-
-1. Summary
-
-   This document extends the hidden service control port events and commands
-   to version 3 (rend-spec-v3.txt).
-
-   No command nor events are newly added in this document, it only desribes
-   how the current commands and events are extended to support v3.
-
-2. Format
-
-   The formatting of this document follows section 2 of control-spec.txt. It
-   is split in two sections, the Commands and the Events for hidden service
-   version 3.
-
-   We define the alphabet of a Base64 encoded value to be:
-
-  Base64Character = "A"-"Z" / "a"-"z" / "0"-"9" / "+" / "/"
-
-   For a command or event, if nothing is mentionned, the behavior doesn't
-   change from the control port specification.
-
-3. Specification:
-
-3.1. Commands
-
-   As specified in the control specification, all commands are
-   case-insensitive but the keywords are case-sensitive.
-
-3.1.1. GETINFO
-
-   Hidden service commands are:
-
- "hs/client/desc/id/"
-   The  can be a v3 address without the ".onion" part. The rest is
-   as is.
-
- "hs/service/desc/id/"
-   The  can be a v3 address without the ".onion" part. The rest is
-   as is.
-
- "onions/{current,detached}"
-   No change. This command can support v3 hidden service without changes
-   returning v3 address(es).
-
-3.1.2. HSFETCH
-
-   The syntax of this command supports both an HSAddress or a versionned
-   descriptor ID. However, for descriptor ID, version 3 doesn't have the same
-   concept as v2 so, for v3 the descriptor ID is the blinded key of a
-   descriptor which is used as an index to query the HSDir:
-
-   The syntax becomes:
- "HSFETCH" SP (HSAddress / "v" Version "-" DescId)
-   *[SP "SERVER=" Server] CRLF
-
- HSAddress = (16*Base32Character / 56*Base32Character)
- Version = "2" / "3"
- DescId = (32*Base32Character / 32*Base64Character)
- Server = LongName
-
-   The "HSAddress" key is extended to accept 56 base32 characters which is the
-   format of a version 3 onion address.
-
-   The "DescId" of the form 32*Base64Character is the descriptor blinded key
-   used as an index to query the directory. It can only be used with
-   "Version=3".
-
-3.1.5. HSPOST
-
-   No change. This command can support v3 hidden service without changes.
-
-3.1.3. ADD_ONION
-
-   For this command to support version 3, new values are added but the syntax
-   is unchanged:
-
- "ADD_ONION" SP KeyType ":" KeyBlob
- [SP "Flags=" Flag *("," Flag)]
- 1*(SP "Port=" VirtPort ["," Target])
- *(SP "ClientAuth=" ClientName [":" ClientBlob]) CRLF
-
-   New "KeyType" value to "ED25519-V3" which identifies the key type to be a
-   v3 ed25519 key.
-
-   New "KeyBlob" value to support the new "ED25519-V3", if specified, will
-   generate a new ed25519 private key.
-
-   Because client authentication is not yet implemented, the "ClientAuth"
-   field is ignored as well as "Flags=BasicAuth".
-
-3.1.4. DEL_ONION
-
-   The syntax of this command is:
-
- "DEL_ONION" SP ServiceID CRLF
-
- ServiceID = The Onion Service address without the trailing ".onion"
- suffix
-
-   The "ServiceID" can simply be a v3 address. Nothing else changes.
-
-3.2. Events
-
-3.2.1. HS_DESC
-
-   For this event to support vesrion 3, one optional field and new
-   values are added:
-
- "650" SP "HS_DESC" SP Action SP HSAddress SP AuthType SP HsDir
-   [SP DescriptorID] [SP "REASON=" Reason] [SP "REPLICA=" Replica]
-   [SP "HSDIR_INDEX=" HSDirIndex]
-
- Action =  "REQUESTED" / "UPLOAD" / "RECEIVED" / "UPLOADED" / "IGNORE" /
-   "FAILED" / "CREATED"
- HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN"
- AuthType = "NO_AUTH" / "BASIC_AUTH" / "STEALTH_AUTH" / "UNKNOWN"
- HsDir = LongName / Fingerprint / "UNKNOWN"
- DescriptorID = 32*Base32Character / 32*Base64Character
- Reason = "BAD_DESC" / "QUERY_REJECTED" / "UPLOAD_REJECTED" / "NOT_FOUND" /
-  "UNEXPECTED" / "QUERY_NO_HSDIR"
- Replica = 1*DIGIT
- HSDirIndex = 64*HEXDIG
-
-   The "HSDIR_INDEX=" is an optional field that is only for version 3 which
-   contains the computed index of the HsDir the descriptor was uploaded to or

96 matches

Mail list logo