commit 54fe60c8690e0e775b2fb6457009280a6a0528d8
Author: Translation commit bot <translation(a)torproject.org>
Date: Mon Nov 1 19:45:03 2021 +0000
https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
ka/aboutTor.dtd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ka/aboutTor.dtd b/ka/aboutTor.dtd
index 24a4d98dd6..3dbf09a6bc 100644
--- a/ka/aboutTor.dtd
+++ b/ka/aboutTor.dtd
@@ -47,7 +47,7 @@
Thank you!
-->
-<!ENTITY …
[View More]aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.slogan "ᲮᲔᲚᲔᲑᲘ\nᲨᲝᲠᲡ ᲩᲔᲛᲘ\nᲞᲘᲠᲐᲓᲘ\nᲡᲘᲕᲠᲪᲘᲡᲒᲐᲜ">
<!ENTITY aboutTor.yec.motto "პირადულობა ადამიანის ძირითადი უფლებაა">
<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
also format it like the name of an organization in whichever way that is appropriate for your locale.
@@ -56,4 +56,4 @@
Thank you!
-->
-<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
+<!ENTITY aboutTor.yec.donationMatch "თქვენი შემოწირულობა გაორმაგდება Tor-ის მეგობრების მიერ, $150,000-ამდე.">
[View Less]
commit 0342610e516c843a0faa3b5f0371e51d46491c4a
Author: Translation commit bot <translation(a)torproject.org>
Date: Mon Nov 1 19:15:22 2021 +0000
https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-cont…
---
contents+ka.po | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/contents+ka.po b/contents+ka.po
index 2138aed6a1..a6e4863caf 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -61,6 +61,8 @@ msgid ""
"- Step 3: Download Tor Browser from one …
[View More]of the providers. When done, check "
"the integrity of the downloaded file by verifying its signature."
msgstr ""
+"- ნაბიჯი 3: ჩამოტვირთავთ Tor-ბრაუზერს რომელიმე მათგანიდან. მზადაა, "
+"გადაამოწმეთ ჩამოტვირთული ფაილის მთლიანობა ხელმოწერის დადასტურებით."
#: https//gettor.torproject.org/ (content/contents+en.lrpage.body)
msgid "- Step 4: If required, get some bridges!"
@@ -157,6 +159,9 @@ msgid ""
"want to use bridges. To use pluggable transports, click 'Configure' in the "
"Tor Launcher window that appears when you first run Tor Browser."
msgstr ""
+"როცა პირველად უშვებთ Tor-ბრაუზერს, გეკითხებათ, გსურთ თუ არა ხიდების "
+"გამოყენება. მისაერთებელი გადამყვანებით სარგებლობისთვის, დაწკაპეთ „გამართვას“"
+" Tor-ის გამშვებ ფანჯარაში, Tor-ბრაუზერის პირველი გაშვებისას."
#: https//gettor.torproject.org/ (content/contents+en.lrpage.body)
msgid ""
@@ -165,6 +170,9 @@ msgid ""
"bar. Once in Preferences, navigate to 'Tor' from the menu on the left of the"
" screen."
msgstr ""
+"მისაერთებელი გადამყვანების გამართვა, უკვე გაშვებული Tor-ბრაუზერიდანაც "
+"შეგიძლიათ „პარამეტრებზე“ გადასვლით, მისამართების ველის მარჯვნივ არსებული "
+"მენიუდან. იქვე, მონახეთ „Tor“ ეკრანის მარცხენა არეში."
#: https//gettor.torproject.org/ (content/contents+en.lrpage.body)
msgid ""
@@ -172,6 +180,9 @@ msgid ""
"bridge.' Click on the drop-down menu and select the pluggable transport "
"you'd like to use."
msgstr ""
+"„ხიდების“ განყოფილებაში, აირჩიეთ „ხიდის გამოყენება“ და შემდეგ „ჩაშენებული "
+"გადამცემი ხიდის მითითება“. დაწკაპეთ ჩამოსაშლელ მენიუს და აირჩიეთ სასურველი "
+"მისაერთებელი გადამყვანი გამოსაყენებლად."
#: https//gettor.torproject.org/ (content/contents+en.lrpage.body)
msgid "Click 'OK' to save your settings."
[View Less]
commit d2b9010b2ebbf293377516af98810c6597687292
Author: David Goulet <dgoulet(a)torproject.org>
Date: Mon Nov 1 14:53:51 2021 -0400
prop328: Update it to reflect implementation
Signed-off-by: David Goulet <dgoulet(a)torproject.org>
---
proposals/328-relay-overload-report.md | 39 ++++++++++++++++------------------
1 file changed, 18 insertions(+), 21 deletions(-)
diff --git a/proposals/328-relay-overload-report.md b/proposals/328-relay-overload-report.md
index …
[View More]5f4c6fd..9348c80 100644
--- a/proposals/328-relay-overload-report.md
+++ b/proposals/328-relay-overload-report.md
@@ -39,9 +39,15 @@ state" which can be one or many of the following load metrics:
- Any OOM invocation due to memory pressure
- Any ntor onionskins are dropped
- TCP port exhaustion
- - DNS timeout reached
+ - DNS timeout reached (X% of timeouts over Y seconds).
- CPU utilization of Tor's mainloop CPU core above 90% for 60 sec
+ [Never implemented]
- Control port overload (too many messages queued)
+ [Never implemented]
+
+For DNS timeouts, the X and Y are consensus parameters
+(overload_dns_timeout_scale_percent and overload_dns_timeout_period_secs)
+defined in param-spec.txt.
The format of the overloaded line added in the server descriptor document is
as follows:
@@ -64,9 +70,7 @@ this 72 hour period restarts.
The 'version' field is set to '1' for the initial implementation of this
proposal which includes all the above overload metrics except from the CPU and
-control port overload. The first version also uses a primitive logic for
-detecting DNS timeouts (only if libevent failed a set of 3 DNS requests/retries
-in a row).
+control port overload.
# 1.2. Token bucket size
@@ -121,10 +125,7 @@ proposal which detects fd exhaustion only when a socket open fails.
This section proposes a series of metrics that should be collected and
reported to the MetricsPort. The Prometheus format (only one supported for
-now) is described for each metrics but each of them are prefixed with the
-following in order to have a proper namespace for "load" events:
-
-`tor_load_`
+now) is described for each metrics.
## 2.1 Out-Of-Memory (OOM) Invocation
@@ -134,7 +135,7 @@ so any invocation of the OOM should be reported.
```
# HELP Total number of bytes the OOM has cleaned up
# TYPE counter
-tor_load_oom_bytes_total{<LABEL>} <VALUE>
+tor_relay_load_oom_bytes_total{<LABEL>} <VALUE>
```
Running counter of how many bytes were cleaned up by the OOM for a tor
@@ -157,7 +158,7 @@ thus one can provide a total processed versus dropped ratio:
```
# HELP Total number of onionskins
# TYPE counter
-tor_load_onionskin_total{<LABEL>} <NUM>
+tor_relay_load_onionskins_total{<LABEL>} <NUM>
```
Possible LABELs are:
@@ -173,14 +174,14 @@ opened file descriptors. In Tor's use case, this is mostly sockets. File
descriptors should be reported as follow:
```
-# HELP Total number of file descriptors
+# HELP Total number of sockets
# TYPE gauge
-tor_load_fd_total{<LABEL>} <NUM>
+tor_relay_load_socket_total{<LABEL>} <NUM>
```
Possible LABELs are:
- - `state=total`: Maximum number of file descriptors allowed open
- - `state=opened`: How many file descriptors are opened.
+ - <none>: How many available sockets.
+ - `state=opened`: How many sockets are opened.
Note: since tor does track that value in order to reserve a block for critical
port such as the Control Port, that value can easily be exported.
@@ -192,15 +193,11 @@ open more outbound sockets, that is an overloaded state. It should be
reported:
```
-# HELP Total number of opened outbound connections.
+# HELP Total number of times we ran out of TCP ports
# TYPE gauge
-tor_load_socket_total{<LABEL>} <NUM>
+tor_relay_load_tcp_exhaustion_total <NUM>
```
-Possible LABELs are:
- - `state=total`: Maximum number of sockets allowed open
- - `state=opened`: How sockets are opened.
-
## 2.5 Connection Bucket Limit
Rate limited connections track bandwidth using a bucket system. Once the
@@ -210,7 +207,7 @@ second later. Once that is hit, it should be reported:
```
# HELP Total number of global connection bucket limit reached
# TYPE counter
-tor_load_global_rate_limit_reached_total{<LABEL>} <NUM>
+tor_relay_load_global_rate_limit_reached_total{<LABEL>} <NUM>
```
Possible LABELs are:
[View Less]
commit 588cb27710165ad1b72ac41b491070b431d6653b
Author: David Goulet <dgoulet(a)torproject.org>
Date: Mon Nov 1 15:03:09 2021 -0400
param-spec: Add the DNS timeout overload parameters
Signed-off-by: David Goulet <dgoulet(a)torproject.org>
---
param-spec.txt | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/param-spec.txt b/param-spec.txt
index f420944..429ec13 100644
--- a/param-spec.txt
+++ b/param-spec.txt
@@ -191,6 +191,21 @@ Table of Contents
…
[View More] Min: 0. Max: 1. Default: 0.
First-appeared: 0.2.3.11-alpha
+ "overload_dns_timeout_scale_percent" -- This value is a percentage of how
+ many DNS timeout over N seconds we accept before reporting the overload
+ general state. It is scaled by a factor of 1000 in order to be able to
+ represent decimal point. As an example, a value of 1000 means 1%.
+ Min: 0. Max: 100000. Default: 1000.
+ First-appeared: 0.4.6.8
+
+ "overload_dns_timeout_period_secs" -- This value is the period in seconds
+ of the DNS timeout measurements (the N in the
+ "overload_dns_timeout_scale_percent" parameter). For this amount of
+ seconds, we will gather DNS statistics and at the end, we'll do an
+ assessment on the overload general signal with regards to DNS timeouts.
+ Min: 0. Max: 2147483647. Default: 600
+ First-appeared: 0.4.6.8
+
8. V3 onion service parameters
"hs_intro_min_introduce2", "hs_intro_max_introduce2" --
[View Less]
commit 2b0093c2c972853e5c2c6bc9e41dc83a4a2e7793
Author: David Goulet <dgoulet(a)torproject.org>
Date: Mon Nov 1 14:44:43 2021 -0400
dir-spec: Merge prop328 into main specifications
Signed-off-by: David Goulet <dgoulet(a)torproject.org>
---
dir-spec.txt | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/dir-spec.txt b/dir-spec.txt
index 543e341..5076366 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -955,…
[View More]6 +955,75 @@ Table of Contents
[Before Tor 0.4.5.1-alpha, this field was optional.]
+ "overload-general" SP version SP YYYY-MM-DD HH:MM:SS NL
+
+ [At most once.]
+
+ Indicate that the relay is overloaded due to one or many conditions
+ listed in proposal 328 section 1.1.
+
+ The timestamp is always rounded to the hour indicating when was the last
+ time the relay detected an overloaded state.
+
+ The 'version' field is a versioning field and is set to '1'. See prop328
+ for what consists of an overload state.
+
+ This field remains in place for 72 hours since last triggered. If the
+ limits are reached again in this period, the timestamp is updated, and
+ this 72 hour period restarts.
+
+ This indicator is not persistent on disk meaning that if the relay
+ restarts, the overload state is reset and disappear from the descriptor.
+
+ [Introduced in version 0.4.6.1-alpha]
+
+ "overload-ratelimits" SP version SP YYYY-MM-DD SP HH:MM:SS
+ SP rate-limit SP burst-limit
+ SP read-overload-count SP write-overload-count NL
+
+ [At most once.]
+
+ Indiate that the relay read or write rate limits were reached which is
+ a specific overload signal.
+
+ The 'version' field is a versioning field and is set to '1'.
+
+ The '{rate|burst}-limit' are respectively the torrc options
+ 'BandwidthBurst' and 'BandwidthRate' limits set by the relay. In other
+ words, they are the bandwidth limitations of the relay.
+
+ The "{read|write}-overload-count" are the counts of how many times the
+ reported limits of burst/rate were exhausted and thus the maximum
+ between the read and write count occurrences. To make the counter more
+ meaningful and to avoid multiple connections saturating the counter when
+ a relay is overloaded, we only increment it once a minute.
+
+ They span from the past 24 hours starting at the provided timestamp
+ rounded down to the hour.
+
+ These counters are not persistent on disk meaning that if the relay
+ restarts, the overload state is reset and disappear from the descriptor.
+
+ [Introduced in version 0.4.6.1-alpha]
+
+ "overload-fd-exhausted" SP version YYYY-MM-DD HH:MM:SS NL
+
+ [At most once.]
+
+ As the overloaded line, the timestamp indicates that the maximum of file
+ descriptors was reached between this timestamp and the "published"
+ timestamp of the document.
+
+ This overload field remains in place for 72 hours since last triggered.
+ If the limits are reached again in this period, the timestamp is
+ updated, and this 72 hour period restarts.
+
+ The 'version' field is a versioning field and is set to '1'.
+
+ This indicator is not persistent on disk meaning that if the relay
+ restarts, the overload state is reset and disappear from the descriptor.
+
+ [Introduced in version 0.4.6.1-alpha]
2.1.2. Extra-info document format
[View Less]
commit 87a8beff0cc4a88d5704e0cd2242f6df051ed355
Author: David Goulet <dgoulet(a)torproject.org>
Date: Mon Nov 1 14:54:11 2021 -0400
prop328: Close after merging it to dir-spec.txt
Closes #70
Signed-off-by: David Goulet <dgoulet(a)torproject.org>
---
proposals/000-index.txt | 4 ++--
proposals/328-relay-overload-report.md | 2 +-
proposals/BY_INDEX.md | 2 +-
proposals/README.md | 2 +-
4 files changed, 5 …
[View More]insertions(+), 5 deletions(-)
diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index ddedaba..a8de698 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -248,7 +248,7 @@ Proposals by number:
325 Packed relay cells: saving space on small commands [OPEN]
326 The "tor-relay" Well-Known Resource Identifier [OPEN]
327 A First Take at PoW Over Introduction Circuits [DRAFT]
-328 Make Relays Report When They Are Overloaded [FINISHED]
+328 Make Relays Report When They Are Overloaded [CLOSED]
329 Overcoming Tor's Bottlenecks with Traffic Splitting [DRAFT]
330 Modernizing authority contact entries [OPEN]
331 Res tokens: Anonymous Credentials for Onion Service DoS Resilience [DRAFT]
@@ -330,7 +330,6 @@ Proposals by status:
301 Don't include package fingerprints in consensus documents
310 Towards load-balancing in Prop 271
314 Allow Markdown for proposal format
- 328 Make Relays Report When They Are Overloaded
CLOSED:
101 Voting on the Tor Directory System [in 0.2.0.x]
102 Dropping "opt" from the directory format [in 0.2.0.x]
@@ -425,6 +424,7 @@ Proposals by status:
304 Extending SOCKS5 Onion Service Error Codes
305 ESTABLISH_INTRO Cell DoS Defense Extension
318 Limit protover values to 0-63 [in 0.4.5.1-alpha]
+ 328 Make Relays Report When They Are Overloaded
SUPERSEDED:
112 Bring Back Pathlen Coin Weight
113 Simplifying directory authority administration
diff --git a/proposals/328-relay-overload-report.md b/proposals/328-relay-overload-report.md
index 9348c80..ea0aa95 100644
--- a/proposals/328-relay-overload-report.md
+++ b/proposals/328-relay-overload-report.md
@@ -3,7 +3,7 @@ Filename: 328-relay-overload-report.md
Title: Make Relays Report When They Are Overloaded
Author: David Goulet, Mike Perry
Created: November 3rd 2020
-Status: Finished
+Status: Closed
```
# 0. Introduction
diff --git a/proposals/BY_INDEX.md b/proposals/BY_INDEX.md
index 75dafd7..da9dbef 100644
--- a/proposals/BY_INDEX.md
+++ b/proposals/BY_INDEX.md
@@ -245,7 +245,7 @@ Below are a list of proposals sorted by their proposal number. See
* [`325-packed-relay-cells.md`](/proposals/325-packed-relay-cells.md): Packed relay cells: saving space on small commands [OPEN]
* [`326-tor-relay-well-known-uri-rfc8615.md`](/proposals/326-tor-relay-well-known-uri-rfc8615.md): The "tor-relay" Well-Known Resource Identifier [OPEN]
* [`327-pow-over-intro.txt`](/proposals/327-pow-over-intro.txt): A First Take at PoW Over Introduction Circuits [DRAFT]
-* [`328-relay-overload-report.md`](/proposals/328-relay-overload-report.md): Make Relays Report When They Are Overloaded [FINISHED]
+* [`328-relay-overload-report.md`](/proposals/328-relay-overload-report.md): Make Relays Report When They Are Overloaded [CLOSED]
* [`329-traffic-splitting.txt`](/proposals/329-traffic-splitting.txt): Overcoming Tor's Bottlenecks with Traffic Splitting [DRAFT]
* [`330-authority-contact.md`](/proposals/330-authority-contact.md): Modernizing authority contact entries [OPEN]
* [`331-res-tokens-for-anti-dos.md`](/proposals/331-res-tokens-for-anti-dos.md): Res tokens: Anonymous Credentials for Onion Service DoS Resilience [DRAFT]
diff --git a/proposals/README.md b/proposals/README.md
index ddb6c5b..75f5c4c 100644
--- a/proposals/README.md
+++ b/proposals/README.md
@@ -75,7 +75,6 @@ themselves still need to be merged into the specifications proper.
* [`301-dont-vote-on-package-fingerprints.txt`](/proposals/301-dont-vote-on-package-fingerprints.txt): Don't include package fingerprints in consensus documents
* [`310-bandaid-on-guard-selection.txt`](/proposals/310-bandaid-on-guard-selection.txt): Towards load-balancing in Prop 271
* [`314-allow-markdown-proposals.md`](/proposals/314-allow-markdown-proposals.md): Allow Markdown for proposal format
-* [`328-relay-overload-report.md`](/proposals/328-relay-overload-report.md): Make Relays Report When They Are Overloaded
## META proposals: about the proposal process
@@ -243,6 +242,7 @@ necessary.
* [`304-socks5-extending-hs-error-codes.txt`](/proposals/304-socks5-extending-hs-error-codes.txt): Extending SOCKS5 Onion Service Error Codes
* [`305-establish-intro-dos-defense-extention.txt`](/proposals/305-establish-intro-dos-defense-extention.txt): ESTABLISH_INTRO Cell DoS Defense Extension
* [`318-limit-protovers.md`](/proposals/318-limit-protovers.md): Limit protover values to 0-63
+* [`328-relay-overload-report.md`](/proposals/328-relay-overload-report.md): Make Relays Report When They Are Overloaded
## RESERVE proposals: saving for later
[View Less]