October 2019 - tor-commits - lists.torproject.org

[tor/master] hibernate: Fix repeated "bytes" in comment
by teor＠torproject.org 20 Oct '19

20 Oct '19

commit 02e3e8eda5d0e3d02bd578511b4bb1a5179a1379 Author: teor <teor(a)torproject.org> Date: Sun Oct 20 22:08:23 2019 +1000 hibernate: Fix repeated "bytes" in comment --- src/feature/hibernate/hibernate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/hibernate/hibernate.c b/src/feature/hibernate/hibernate.c index d3a1d2309..f7847d9a1 100644 --- a/src/feature/hibernate/hibernate.c +++ b/src/feature/hibernate/hibernate.c @@ -815,7 +815,7 @@ hibernate_soft_limit_reached(void) * We want to stop accepting connections when ALL of the following are true: * - We expect to use up the remaining bytes in under 3 hours * - We have used up 95% of our bytes. - * - We have less than 500MBytes of bytes left. + * - We have less than 500MBytes left. */ uint64_t soft_limit = (uint64_t) (acct_max * SOFT_LIM_PCT); if (acct_max > SOFT_LIM_BYTES && acct_max - SOFT_LIM_BYTES > soft_limit) {

1 0

[tor/master] Merge branch 'maint-0.4.2'
by teor＠torproject.org 20 Oct '19

20 Oct '19

commit 042116e1fd4d57142b47943f57f6cea79ee941c4 Merge: aab5d9085 02e3e8eda Author: teor <teor(a)torproject.org> Date: Sun Oct 20 22:09:00 2019 +1000 Merge branch 'maint-0.4.2' src/feature/hibernate/hibernate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 20 Oct '19

20 Oct '19

commit 1321f973fc244b34e80347d4d316e96370de1af0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 20 10:52:53 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ca/network-settings.dtd | 77 +++++++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd index 0d02c66eb..278a2edea 100644 --- a/ca/network-settings.dtd +++ b/ca/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Configuració de la xarxa Tor"> -<!ENTITY torsettings.wizard.title.default "Connecta a Tor"> -<!ENTITY torsettings.wizard.title.configure "Configuració de la xarxa Tor"> -<!ENTITY torsettings.wizard.title.connecting "S'està establint connexió"> +<!ENTITY torsettings.wizard.title.default ""> +<!ENTITY torsettings.wizard.title.configure ""> +<!ENTITY torsettings.wizard.title.connecting "">  <!ENTITY torlauncher.localePicker.title "Llengua del navegador Tor"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Feu clic a «Connectar» per a connectar a Tor."> -<!ENTITY torSettings.configurePrompt "Feu clic a «Configura» per a ajustar la configuració de la xarxa si esteu en un país que censura Tor (com ara Egipte, Xina, Turquia) o si us esteu connectant des d'una xarxa privada que requereix un servidor intermediari."> +<!ENTITY torSettings.connectPrompt ""> +<!ENTITY torSettings.configurePrompt ""> <!ENTITY torSettings.configure "Configura"> <!ENTITY torSettings.connect "Conecta't"> @@ -26,38 +26,59 @@ <!ENTITY torsettings.optional "Opcional "> -<!ENTITY torsettings.useProxy.checkbox "Utilitzo un servidor intermediari per a accedir a Internet"> -<!ENTITY torsettings.useProxy.type "Tipus de servidor intermediari local:"> -<!ENTITY torsettings.useProxy.type.placeholder "seleccioneu un tipus de servidor intermediari"> -<!ENTITY torsettings.useProxy.address "Adreça:"> +<!ENTITY torsettings.useProxy.checkbox ""> +<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.type.placeholder ""> +<!ENTITY torsettings.useProxy.address ""> <!ENTITY torsettings.useProxy.address.placeholder "Adreça IP o nom del host"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Nom d'usuari:"> -<!ENTITY torsettings.useProxy.password "Contrasenya:"> +<!ENTITY torsettings.useProxy.port ""> +<!ENTITY torsettings.useProxy.username ""> +<!ENTITY torsettings.useProxy.password ""> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un tallafoc que només permet connexions a certs ports"> -<!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> -<!ENTITY torsettings.useBridges.checkbox "Tor està censurat al meu país"> -<!ENTITY torsettings.useBridges.default "Seleccioneu un pont predefinit"> -<!ENTITY torsettings.useBridges.default.placeholder "seleccioneu un pont"> -<!ENTITY torsettings.useBridges.bridgeDB "Sol·licita un pont a torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Introduïu els caràcters de la imatge"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obtén un repte nou"> -<!ENTITY torsettings.useBridges.captchaSubmit "Tramet"> -<!ENTITY torsettings.useBridges.custom "Proveeix un pont conegut"> -<!ENTITY torsettings.useBridges.label "Introdueix informació d'un pont d'una font fiable."> -<!ENTITY torsettings.useBridges.placeholder "introduïu adreça:port (un per línia)"> +<!ENTITY torsettings.firewall.allowedPorts ""> +<!ENTITY torsettings.useBridges.checkbox ""> +<!ENTITY torsettings.useBridges.default ""> +<!ENTITY torsettings.useBridges.default.placeholder ""> +<!ENTITY torsettings.useBridges.bridgeDB ""> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder ""> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip ""> +<!ENTITY torsettings.useBridges.captchaSubmit ""> +<!ENTITY torsettings.useBridges.custom ""> +<!ENTITY torsettings.useBridges.label ""> +<!ENTITY torsettings.useBridges.placeholder ""> <!ENTITY torsettings.copyLog "Copia el registre de Tor al porta-retalls"> -<!ENTITY torsettings.proxyHelpTitle "Ajuda del servidor intermediari"> -<!ENTITY torsettings.proxyHelp1 "Pot ser necessari un servidor intermediari local quan us connecteu a través de la xarxa d'una empresa, escola o universitat. Si no esteu segur de necessitar un servidor intermediari, mireu els paràmetres d'un altre navegador o comproveu la configuració de xarxa del vostre sistema."> +<!ENTITY torsettings.proxyHelpTitle ""> +<!ENTITY torsettings.proxyHelp1 ""> <!ENTITY torsettings.bridgeHelpTitle "Ajuda per als repetidors de pont"> -<!ENTITY torsettings.bridgeHelp1 "Els ponts són repetidors no llistats que fan més difícil el bloqueig de connexions a la xarxa Tor.  Cada tipus de pont usa un mètode diferent per a evitar la censura.  Els tipus OBFS fan passar el vostre tràfic com a soroll aleatori, mentre que els MEEK fan que paregui que es connecta a un altre servei diferent a Tor."> -<!ENTITY torsettings.bridgeHelp2 "Depenent de com intente bloquejar Tor cada país, alguns ponts poden funcionar correctament en certs països però no en altres.  Si no esteu segurs de quins ponts funcionen al vostre país, visiteu torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 ""> +<!ENTITY torsettings.bridgeHelp2 "">  -<!ENTITY torprogress.pleaseWait "Espereu mentre establim una connexió amb la xarxa Tor.  Això pot tardar uns minuts."> +<!ENTITY torprogress.pleaseWait ""> + + +<!ENTITY torPreferences.categoryTitle ""> +<!ENTITY torPreferences.torSettings ""> +<!ENTITY torPreferences.torSettingsDescription "" > +<!ENTITY torPreferences.learnMore ""> +<!ENTITY torPreferences.bridges ""> +<!ENTITY torPreferences.bridgesDescription ""> +<!ENTITY torPreferences.useBridge ""> +<!ENTITY torPreferences.requestNewBridge ""> +<!ENTITY torPreferences.provideBridge ""> +<!ENTITY torPreferences.advanced ""> +<!ENTITY torPreferences.advancedDescription ""> +<!ENTITY torPreferences.firewallPortsPlaceholder ""> +<!ENTITY torPreferences.requestBridgeDialogTitle ""> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt ""> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt ""> +<!ENTITY torPreferences.requestBridgeErrorBadSolution ""> +<!ENTITY torPreferences.viewTorLogs ""> +<!ENTITY torPreferences.viewLogs ""> +<!ENTITY torPreferences.torLogsDialogTitle "">

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 20 Oct '19

20 Oct '19

commit 70eaf615388a9de05e218f499fa1bd30ed274046 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 20 10:52:48 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ca/network-settings.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd index 7e19a17e1..de9e67316 100644 --- a/ca/network-settings.dtd +++ b/ca/network-settings.dtd @@ -74,11 +74,11 @@ <!ENTITY torPreferences.provideBridge "Proporciona un pont"> <!ENTITY torPreferences.advanced "Avançat"> <!ENTITY torPreferences.advancedDescription "Configureu la manera en què el navegador Tor es connecta a Internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Valors separats per comes"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Sol·licita un pont"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "S'està contactant amb el BridgeDB. Espereu."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolgueu el CAPTCHA per a sol·licitar un pont."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solució no és correcta. Torneu a provar-ho."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Mostra els registres de Tor."> +<!ENTITY torPreferences.viewLogs "Mostra els registres…"> +<!ENTITY torPreferences.torLogsDialogTitle "Registres del Tor">

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 20 Oct '19

20 Oct '19

commit c1cfead3fd1f6e392025c7c56711d77be15ca9d1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 20 10:23:11 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ca/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd index 26a4adfe1..7e19a17e1 100644 --- a/ca/network-settings.dtd +++ b/ca/network-settings.dtd @@ -73,7 +73,7 @@ <!ENTITY torPreferences.requestNewBridge "Sol·licita un pont nou..."> <!ENTITY torPreferences.provideBridge "Proporciona un pont"> <!ENTITY torPreferences.advanced "Avançat"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> +<!ENTITY torPreferences.advancedDescription "Configureu la manera en què el navegador Tor es connecta a Internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">

1 0

[tor/master] fix easy typos
by arma＠torproject.org 20 Oct '19

20 Oct '19

commit 8b4d7447ae2bc4929e41c0b916f4690ebbc7b9ec Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Oct 20 05:52:32 2019 -0400 fix easy typos --- ChangeLog | 11 +++++------ ReleaseNotes | 2 +- src/feature/hibernate/hibernate.c | 6 +++--- src/feature/rend/rendservice.c | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59ded0082..5b86efe7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5300,7 +5300,7 @@ Changes in version 0.3.4.1-alpha - 2018-05-17 - Remove duplicate code in parse_{c,s}method_line and bootstrap their functionalities into a single function. Fixes bug 6236; bugfix on 0.2.3.6-alpha. - - We remove the PortForwsrding and PortForwardingHelper options, + - We remove the PortForwarding and PortForwardingHelper options, related functions, and the port_forwarding tests. These options were used by the now-deprecated Vidalia to help ordinary users become Tor relays or bridges. Closes ticket 25409. Patch by @@ -11902,7 +11902,7 @@ Changes in version 0.2.9.3-alpha - 2016-09-23 HiddenServiceNonAnonymousMode options. When both are set to 1, every hidden service on a Tor instance becomes a non-anonymous Single Onion Service. Single Onions make one-hop (direct) - connections to their introduction and renzedvous points. One-hop + connections to their introduction and rendezvous points. One-hop circuits make Single Onion servers easily locatable, but clients remain location-anonymous. This is compatible with the existing hidden service implementation, and works on the current tor @@ -12405,13 +12405,12 @@ Changes in version 0.2.9.1-alpha - 2016-08-08 needless crash bugs. Closes ticket 18613. o Minor features (performance): - - Changer the "optimistic data" extension from "off by default" to + - Change the "optimistic data" extension from "off by default" to "on by default". The default was ordinarily overridden by a consensus option, but when clients were bootstrapping for the first time, they would not have a consensus to get the option - from. Changing this default When fetching a consensus for the - first time, use optimistic data. This saves a round-trip during - startup. Closes ticket 18815. + from. Changing this default saves a round-trip during startup. + Closes ticket 18815. o Minor features (relay, usability): - When the directory authorities refuse a bad relay's descriptor, diff --git a/ReleaseNotes b/ReleaseNotes index 8b7dd18ba..ad24efd60 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3469,7 +3469,7 @@ Changes in version 0.3.4.8 - 2018-09-10 - Remove duplicate code in parse_{c,s}method_line and bootstrap their functionalities into a single function. Fixes bug 6236; bugfix on 0.2.3.6-alpha. - - We remove the PortForwsrding and PortForwardingHelper options, + - We remove the PortForwarding and PortForwardingHelper options, related functions, and the port_forwarding tests. These options were used by the now-deprecated Vidalia to help ordinary users become Tor relays or bridges. Closes ticket 25409. Patch by diff --git a/src/feature/hibernate/hibernate.c b/src/feature/hibernate/hibernate.c index 674fe3c81..d3a1d2309 100644 --- a/src/feature/hibernate/hibernate.c +++ b/src/feature/hibernate/hibernate.c @@ -67,7 +67,7 @@ static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL; /** If are hibernating, when do we plan to wake up? Set to 0 if we * aren't hibernating. */ static time_t hibernate_end_time = 0; -/** If we are shutting down, when do we plan finally exit? Set to 0 if we +/** If we are shutting down, when do we plan to finally exit? Set to 0 if we * aren't shutting down. (This is obsolete; scheduled shutdowns are supposed * to happen from mainloop_schedule_shutdown() now.) */ static time_t shutdown_time = 0; @@ -562,7 +562,7 @@ time_to_record_bandwidth_usage(time_t now) /* Note every 600 sec */ #define NOTE_INTERVAL (600) /* Or every 20 megabytes */ -#define NOTE_BYTES 20*(1024*1024) +#define NOTE_BYTES (20*1024*1024) static uint64_t last_read_bytes_noted = 0; static uint64_t last_written_bytes_noted = 0; static time_t last_time_noted = 0; @@ -815,7 +815,7 @@ hibernate_soft_limit_reached(void) * We want to stop accepting connections when ALL of the following are true: * - We expect to use up the remaining bytes in under 3 hours * - We have used up 95% of our bytes. - * - We have less than 500MB of bytes left. + * - We have less than 500MBytes of bytes left. */ uint64_t soft_limit = (uint64_t) (acct_max * SOFT_LIM_PCT); if (acct_max > SOFT_LIM_BYTES && acct_max - SOFT_LIM_BYTES > soft_limit) { diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 4d8a21e6a..e0cf06b9d 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -3999,7 +3999,7 @@ remove_invalid_intro_points(rend_service_t *service, * accounted for when considiring uploading a descriptor. */ intro->circuit_established = 0; - /* Node is gone or we've reached our maximum circuit creationg retry + /* Node is gone or we've reached our maximum circuit creation retry * count, clean up everything, we'll find a new one. */ if (node == NULL || intro->circuit_retries >= MAX_INTRO_POINT_CIRCUIT_RETRIES) {

1 0

[tor/master] Merge branch 'maint-0.4.2'
by arma＠torproject.org 20 Oct '19

20 Oct '19

commit aab5d90858beb7eb9738c237dab5bcb7dd6ce91f Merge: 37320bce0 8b4d7447a Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Oct 20 05:56:16 2019 -0400 Merge branch 'maint-0.4.2' ChangeLog | 11 +++++------ ReleaseNotes | 2 +- src/feature/hibernate/hibernate.c | 6 +++--- src/feature/rend/rendservice.c | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-)

1 0

[tor/release-0.4.2] fix easy typos
by arma＠torproject.org 20 Oct '19

20 Oct '19

commit 8b4d7447ae2bc4929e41c0b916f4690ebbc7b9ec Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Oct 20 05:52:32 2019 -0400 fix easy typos --- ChangeLog | 11 +++++------ ReleaseNotes | 2 +- src/feature/hibernate/hibernate.c | 6 +++--- src/feature/rend/rendservice.c | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59ded0082..5b86efe7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5300,7 +5300,7 @@ Changes in version 0.3.4.1-alpha - 2018-05-17 - Remove duplicate code in parse_{c,s}method_line and bootstrap their functionalities into a single function. Fixes bug 6236; bugfix on 0.2.3.6-alpha. - - We remove the PortForwsrding and PortForwardingHelper options, + - We remove the PortForwarding and PortForwardingHelper options, related functions, and the port_forwarding tests. These options were used by the now-deprecated Vidalia to help ordinary users become Tor relays or bridges. Closes ticket 25409. Patch by @@ -11902,7 +11902,7 @@ Changes in version 0.2.9.3-alpha - 2016-09-23 HiddenServiceNonAnonymousMode options. When both are set to 1, every hidden service on a Tor instance becomes a non-anonymous Single Onion Service. Single Onions make one-hop (direct) - connections to their introduction and renzedvous points. One-hop + connections to their introduction and rendezvous points. One-hop circuits make Single Onion servers easily locatable, but clients remain location-anonymous. This is compatible with the existing hidden service implementation, and works on the current tor @@ -12405,13 +12405,12 @@ Changes in version 0.2.9.1-alpha - 2016-08-08 needless crash bugs. Closes ticket 18613. o Minor features (performance): - - Changer the "optimistic data" extension from "off by default" to + - Change the "optimistic data" extension from "off by default" to "on by default". The default was ordinarily overridden by a consensus option, but when clients were bootstrapping for the first time, they would not have a consensus to get the option - from. Changing this default When fetching a consensus for the - first time, use optimistic data. This saves a round-trip during - startup. Closes ticket 18815. + from. Changing this default saves a round-trip during startup. + Closes ticket 18815. o Minor features (relay, usability): - When the directory authorities refuse a bad relay's descriptor, diff --git a/ReleaseNotes b/ReleaseNotes index 8b7dd18ba..ad24efd60 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3469,7 +3469,7 @@ Changes in version 0.3.4.8 - 2018-09-10 - Remove duplicate code in parse_{c,s}method_line and bootstrap their functionalities into a single function. Fixes bug 6236; bugfix on 0.2.3.6-alpha. - - We remove the PortForwsrding and PortForwardingHelper options, + - We remove the PortForwarding and PortForwardingHelper options, related functions, and the port_forwarding tests. These options were used by the now-deprecated Vidalia to help ordinary users become Tor relays or bridges. Closes ticket 25409. Patch by diff --git a/src/feature/hibernate/hibernate.c b/src/feature/hibernate/hibernate.c index 674fe3c81..d3a1d2309 100644 --- a/src/feature/hibernate/hibernate.c +++ b/src/feature/hibernate/hibernate.c @@ -67,7 +67,7 @@ static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL; /** If are hibernating, when do we plan to wake up? Set to 0 if we * aren't hibernating. */ static time_t hibernate_end_time = 0; -/** If we are shutting down, when do we plan finally exit? Set to 0 if we +/** If we are shutting down, when do we plan to finally exit? Set to 0 if we * aren't shutting down. (This is obsolete; scheduled shutdowns are supposed * to happen from mainloop_schedule_shutdown() now.) */ static time_t shutdown_time = 0; @@ -562,7 +562,7 @@ time_to_record_bandwidth_usage(time_t now) /* Note every 600 sec */ #define NOTE_INTERVAL (600) /* Or every 20 megabytes */ -#define NOTE_BYTES 20*(1024*1024) +#define NOTE_BYTES (20*1024*1024) static uint64_t last_read_bytes_noted = 0; static uint64_t last_written_bytes_noted = 0; static time_t last_time_noted = 0; @@ -815,7 +815,7 @@ hibernate_soft_limit_reached(void) * We want to stop accepting connections when ALL of the following are true: * - We expect to use up the remaining bytes in under 3 hours * - We have used up 95% of our bytes. - * - We have less than 500MB of bytes left. + * - We have less than 500MBytes of bytes left. */ uint64_t soft_limit = (uint64_t) (acct_max * SOFT_LIM_PCT); if (acct_max > SOFT_LIM_BYTES && acct_max - SOFT_LIM_BYTES > soft_limit) { diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 4d8a21e6a..e0cf06b9d 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -3999,7 +3999,7 @@ remove_invalid_intro_points(rend_service_t *service, * accounted for when considiring uploading a descriptor. */ intro->circuit_established = 0; - /* Node is gone or we've reached our maximum circuit creationg retry + /* Node is gone or we've reached our maximum circuit creation retry * count, clean up everything, we'll find a new one. */ if (node == NULL || intro->circuit_retries >= MAX_INTRO_POINT_CIRCUIT_RETRIES) {

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by arma＠torproject.org 20 Oct '19

20 Oct '19

commit 7e6640453881b9f51ebdcbdd4f4270add0004da8 Merge: 00ad6f12f 8b4d7447a Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Oct 20 05:55:46 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 ChangeLog | 11 +++++------ ReleaseNotes | 2 +- src/feature/hibernate/hibernate.c | 6 +++--- src/feature/rend/rendservice.c | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.4.2] fix easy typos
by arma＠torproject.org 20 Oct '19

20 Oct '19

commit 8b4d7447ae2bc4929e41c0b916f4690ebbc7b9ec Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Oct 20 05:52:32 2019 -0400 fix easy typos --- ChangeLog | 11 +++++------ ReleaseNotes | 2 +- src/feature/hibernate/hibernate.c | 6 +++--- src/feature/rend/rendservice.c | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59ded0082..5b86efe7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5300,7 +5300,7 @@ Changes in version 0.3.4.1-alpha - 2018-05-17 - Remove duplicate code in parse_{c,s}method_line and bootstrap their functionalities into a single function. Fixes bug 6236; bugfix on 0.2.3.6-alpha. - - We remove the PortForwsrding and PortForwardingHelper options, + - We remove the PortForwarding and PortForwardingHelper options, related functions, and the port_forwarding tests. These options were used by the now-deprecated Vidalia to help ordinary users become Tor relays or bridges. Closes ticket 25409. Patch by @@ -11902,7 +11902,7 @@ Changes in version 0.2.9.3-alpha - 2016-09-23 HiddenServiceNonAnonymousMode options. When both are set to 1, every hidden service on a Tor instance becomes a non-anonymous Single Onion Service. Single Onions make one-hop (direct) - connections to their introduction and renzedvous points. One-hop + connections to their introduction and rendezvous points. One-hop circuits make Single Onion servers easily locatable, but clients remain location-anonymous. This is compatible with the existing hidden service implementation, and works on the current tor @@ -12405,13 +12405,12 @@ Changes in version 0.2.9.1-alpha - 2016-08-08 needless crash bugs. Closes ticket 18613. o Minor features (performance): - - Changer the "optimistic data" extension from "off by default" to + - Change the "optimistic data" extension from "off by default" to "on by default". The default was ordinarily overridden by a consensus option, but when clients were bootstrapping for the first time, they would not have a consensus to get the option - from. Changing this default When fetching a consensus for the - first time, use optimistic data. This saves a round-trip during - startup. Closes ticket 18815. + from. Changing this default saves a round-trip during startup. + Closes ticket 18815. o Minor features (relay, usability): - When the directory authorities refuse a bad relay's descriptor, diff --git a/ReleaseNotes b/ReleaseNotes index 8b7dd18ba..ad24efd60 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3469,7 +3469,7 @@ Changes in version 0.3.4.8 - 2018-09-10 - Remove duplicate code in parse_{c,s}method_line and bootstrap their functionalities into a single function. Fixes bug 6236; bugfix on 0.2.3.6-alpha. - - We remove the PortForwsrding and PortForwardingHelper options, + - We remove the PortForwarding and PortForwardingHelper options, related functions, and the port_forwarding tests. These options were used by the now-deprecated Vidalia to help ordinary users become Tor relays or bridges. Closes ticket 25409. Patch by diff --git a/src/feature/hibernate/hibernate.c b/src/feature/hibernate/hibernate.c index 674fe3c81..d3a1d2309 100644 --- a/src/feature/hibernate/hibernate.c +++ b/src/feature/hibernate/hibernate.c @@ -67,7 +67,7 @@ static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL; /** If are hibernating, when do we plan to wake up? Set to 0 if we * aren't hibernating. */ static time_t hibernate_end_time = 0; -/** If we are shutting down, when do we plan finally exit? Set to 0 if we +/** If we are shutting down, when do we plan to finally exit? Set to 0 if we * aren't shutting down. (This is obsolete; scheduled shutdowns are supposed * to happen from mainloop_schedule_shutdown() now.) */ static time_t shutdown_time = 0; @@ -562,7 +562,7 @@ time_to_record_bandwidth_usage(time_t now) /* Note every 600 sec */ #define NOTE_INTERVAL (600) /* Or every 20 megabytes */ -#define NOTE_BYTES 20*(1024*1024) +#define NOTE_BYTES (20*1024*1024) static uint64_t last_read_bytes_noted = 0; static uint64_t last_written_bytes_noted = 0; static time_t last_time_noted = 0; @@ -815,7 +815,7 @@ hibernate_soft_limit_reached(void) * We want to stop accepting connections when ALL of the following are true: * - We expect to use up the remaining bytes in under 3 hours * - We have used up 95% of our bytes. - * - We have less than 500MB of bytes left. + * - We have less than 500MBytes of bytes left. */ uint64_t soft_limit = (uint64_t) (acct_max * SOFT_LIM_PCT); if (acct_max > SOFT_LIM_BYTES && acct_max - SOFT_LIM_BYTES > soft_limit) { diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 4d8a21e6a..e0cf06b9d 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -3999,7 +3999,7 @@ remove_invalid_intro_points(rend_service_t *service, * accounted for when considiring uploading a descriptor. */ intro->circuit_established = 0; - /* Node is gone or we've reached our maximum circuit creationg retry + /* Node is gone or we've reached our maximum circuit creation retry * count, clean up everything, we'll find a new one. */ if (node == NULL || intro->circuit_retries >= MAX_INTRO_POINT_CIRCUIT_RETRIES) {

1 0