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

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

24 Aug '20

commit 5efc2c16d671f7206e1e5a666608b3090859d1c8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 15:45:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index acee61dbf5..69769fb2bd 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -9019,6 +9019,8 @@ msgid "" "Get the latest version of Tor. If you're on Debian stable, `sudo apt-get " "install tor` should give you the latest stable version of Tor." msgstr "" +"გადმოწერეთ უახლესი ვერსიის Tor. თუ იყენებთ Debian-ის მდგრად გამოშვებას, " +"ბრძანება `sudo apt-get install tor` მოგცემთ უახლესი ვერსიის Tor-ს." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -9027,11 +9029,14 @@ msgid "" "[Download instructions for Ubuntu](https://support.torproject.org/apt/tor-" "deb-repo/)." msgstr "" +"* შენიშვნა: **Ubuntu-ს მომხმარებლებმა უნდა გადმოწერონ Tor-საცავიდან. გთხოვთ " +"იხილოთ** [ჩამოტვირთვის მითითებები Ubuntu-" +"სთვის](https://support.torproject.org/apt/tor-deb-repo/)." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) msgid "### 2. Install obfs4proxy" -msgstr "" +msgstr "### 2. დააყენეთ obfs4proxy" #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -9039,6 +9044,8 @@ msgid "" "On [Debian](https://packages.debian.org/search?keywords=obfs4proxy), the " "`obfs4proxy` package is available in unstable, testing, and stable." msgstr "" +"[Debian-ზე](https://packages.debian.org/search?keywords=obfs4proxy), " +"`obfs4proxy` კრებული ხელმისაწვდომია არამდგრადი, საცდელი და მდგრადი სახით." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -9046,6 +9053,8 @@ msgid "" "On [Ubuntu](https://packages.ubuntu.com/search?keywords=obfs4proxy), bionic," " cosmic, disco, and eoan have the package." msgstr "" +"[Ubuntu-ზე](https://packages.ubuntu.com/search?keywords=obfs4proxy), bionic," +" cosmic, disco, და eoan-ზეა კრებულები." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -9053,6 +9062,8 @@ msgid "" "If you're running any of them, `sudo apt-get install obfs4proxy` should " "work." msgstr "" +"თუ რომელიმე მათგანი გაქვთ გაშვებული, `sudo apt-get install obfs4proxy` " +"ბრძანება იმუშავებს." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -9060,6 +9071,8 @@ msgid "" "If not, you can [build it from " "source](https://gitlab.com/yawning/obfs4#installation)." msgstr "" +"თუ არა, შეგიძლია [ააწყოთ პირდაპირ " +"წყაროდან](https://gitlab.com/yawning/obfs4#installation)." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -9071,16 +9084,18 @@ msgid "" "### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and " "replace its content with:" msgstr "" +"### 3. ჩაასწორეთ თქვენი Tor-ის გასამართი ფაილი, ჩვეულებრივ მდებარეობს " +"მისამართზე `/etc/tor/torrc` და შეცვალეთ შიგთავსით:" #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) msgid "# Replace \"TODO1\" with a Tor port of your choice." -msgstr "" +msgstr "# შეცვალეთ „TODO1“ სასურველი Tor-პორტით." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) msgid "# This port must be externally reachable." -msgstr "" +msgstr "# ეს პორტი გარედან მისაწვდომი უნდა იყოს." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -9088,6 +9103,8 @@ msgid "" "# Avoid port 9001 because it's commonly associated with Tor and censors may " "be scanning the Internet for this port." msgstr "" +"# აირიდეთ პორტი 9001 ვინაიდან, მეტად გაიგივებულია Tor-თან და ცენზორებმა " +"შეიძლება გადაამოწმონ ინტერნეტიდან ეს პორტი." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -9097,7 +9114,7 @@ msgstr "ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy" #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) msgid "# Replace \"TODO2\" with an obfs4 port of your choice." -msgstr "" +msgstr "# შეცვალეთ „TODO2“ სასურველი obfs4-პორტით." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -9105,6 +9122,8 @@ msgid "" "# This port must be externally reachable and must be different from the one " "specified for ORPort." msgstr "" +"# ეს პორტი გარედან მისაწვდომი უნდა იყოს და განსხვავდებოდეს ORPort-სთვის " +"განსაზღვრულისგან." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)

1 0

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

24 Aug '20

commit 83e0ad3984aef62167150cbee6e909823f0d41cf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 15:15:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 72 +++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 21e500f7da..acee61dbf5 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -9011,7 +9011,7 @@ msgstr "როგორ უნდა განთავსდეს obs4-ხი #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) msgid "### 1. Install Tor" -msgstr "" +msgstr "### 1. დააყენეთ Tor" #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -9292,6 +9292,9 @@ msgid "" "`pkg` already installed. Upgrades from earlier releases, however, will not " "have it." msgstr "" +"DragonFlyBSD-ის ყოველდღიურ ასლებს და გამოშვებებს (დაწყებული 3.4-იდან) " +"მოყვება `pkg` დაყენებული. უფრო ადრინდელი გამოშვებულებიდან განახლებულს, " +"თავისთავად ვერ ექნება." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9302,39 +9305,41 @@ msgid "" "bootstrapped without having to build it from source or even having " "**DPorts** installed:" msgstr "" +"თუ `pkg` აკლია თქვენს სისტემას რამე მიზეზით, სწრაფად შეგიძლიათ ჩატვირთოთ " +"წყაროდან აწყობის გარეშე და არც **DPorts** არაა საჭირო ეყენოს:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) msgid "cd /usr" -msgstr "" +msgstr "cd /usr" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) msgid "make pkg-bootstrap" -msgstr "" +msgstr "make pkg-bootstrap" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) msgid "rehash" -msgstr "" +msgstr "rehash" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) msgid "pkg-static install -y pkg" -msgstr "" +msgstr "pkg-static install -y pkg" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "##### 1.1. Recommended Steps to Setup `pkg`" -msgstr "" +msgstr "##### 1.1. სასურველი ნაბიჯები, რომ გაიმართოს `pkg`" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9343,6 +9348,9 @@ msgid "" " going to use HTTPS to fetch our packages, and updates - so here we also " "need an extra package to help us out (`ca_root_nss`)." msgstr "" +"აქაც, მსგავსად **FreeBSD** სისტემისა, გამოვიყენებთ HTTPS-ს, კრებულებისა და " +"განახლებების მისაღებად — შესაბამისად, აქაც გვჭირდება ცალკე კრებული ამისთვის" +" (`ca_root_nss`)." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9351,7 +9359,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "Installing the `ca_root_nss` package:" -msgstr "" +msgstr "დააყენეთ `ca_root_nss` კრებული:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9360,7 +9368,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "pkg install ca_root_nss" -msgstr "" +msgstr "pkg install ca_root_nss" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9372,11 +9380,15 @@ msgid "" "files ending in the \".sample\" extension are ignored; pkg(8) only reads " "files that end in \".conf\" and it will read as many as it finds." msgstr "" +"ახლად დაყენებულზე, `/usr/local/etc/pkg/repos/df-latest.conf.sample` ფაილის " +"ასლი იქნება `/usr/local/etc/pkg/repos/df-latest` მისამართზე. ფაილები " +"დაბოლოებით „.sample“ იქნება უგულებელყოფილი; pkg(8) კითხულობს მხოლოდ „.conf“ " +"დაბოლოების ფაილებს და იმდენივეს, რამდენსაც იპოვის." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "**DragonflyBSD** has 2 packages repositories:" -msgstr "" +msgstr "**DragonflyBSD-ს** აქვს 2 კრებულის საცავი:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9390,7 +9402,7 @@ msgstr "- Avalon (mirror-master.dragonflybsd.org)" #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) msgid "- Wolfpond (pkg.wolfpond.org)" -msgstr "" +msgstr "- Wolfpond (pkg.wolfpond.org)" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9399,6 +9411,9 @@ msgid "" "`/usr/local/etc/pkg/repos/df-latest` and that's it! Remember to use " "**pkg+https://** for Avalon." msgstr "" +"შეგვიძლია უბრალოდ ჩავასწოროთ **URL** რომელიც უთითებს საცავებს " +"`/usr/local/etc/pkg/repos/df-latest` და სულ ესაა! გახსოვდეთ, გამოიყენოთ " +"**pkg+https://** Avalon-ისთვის." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9410,6 +9425,8 @@ msgid "" "After applying all these changes, we update the packages list again and try " "to check if there's already a new update to apply:" msgstr "" +"ყველა ამ ცვლილების შედეგად, შეგვიძლია განვაახლოთ კრებულების სია კვლავ და " +"შევამოწმოთ, არის თუ არა ახალი განახლება მისაღები:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9418,7 +9435,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "pkg update -f" -msgstr "" +msgstr "pkg update -f" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9427,12 +9444,12 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "pkg upgrade -y -f" -msgstr "" +msgstr "pkg upgrade -y -f" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "### 2. Install `tor` and `obfs4proxy` DragonflyBSD's Package" -msgstr "" +msgstr "### 2. დააყენეთ DragonflyBSD-ის `tor` და `obfs4proxy` კრებულები" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9441,12 +9458,12 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "Here we can choose to install the latest stable version, like:" -msgstr "" +msgstr "აქ შეგვიძლია ავირჩიოთ ბოლო მდგრადი ვერსია, ასე:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "pkg install tor obfs4proxy-tor" -msgstr "" +msgstr "pkg install tor obfs4proxy-tor" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9455,17 +9472,18 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "... or install an alpha release:" -msgstr "" +msgstr "... ან დავაყენოთ საცდელი alpha-ვერსია:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "pkg install tor-devel obfs4proxy-tor" -msgstr "" +msgstr "pkg install tor-devel obfs4proxy-tor" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "### 3. Configure `/usr/local/etc/tor/torrc` to run **Tor** as a Bridge" msgstr "" +"### 3. გამართეთ `/usr/local/etc/tor/torrc` რომ გაეშვას **Tor** როგორც ხიდი" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9478,7 +9496,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy" -msgstr "" +msgstr "ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9496,11 +9514,14 @@ msgid "" "can talk to `tor` over the loopback interface - do not forget to whitelist " "the **ExtORPort**." msgstr "" +"* იყენებთ DragonflyBSD-ზე ქსელის ფარს? თუ კი, მაშინ გადაამოწმეთ, რომ თქვენი " +"`obfs4proxy` და `tor` ნამდვილად უკავშირდება ერთმანეთს loopback-გარსით – არ " +"დაგავიწყდეთ გამონაკლისებში დაამატოთ Tor-ის **ExtORPort**." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "### 4. Start `tor`:" -msgstr "" +msgstr "### 4. გაუშვით `tor`:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9513,13 +9534,16 @@ msgid "" " to bind to lower ports like 443 (the daemon itself will still run as a " "regular non-privileged user)." msgstr "" +"აქ ვუთითებთ, რომ `tor` გაეშვას ჩართვისას და გამოიყენოს setuid შესაძლებლობა, " +"რომ მიებას ქვედა პორტებსაც, როგორიცაა 443 (ფონური მომსახურება ისევ " +"ჩვეულებრივ იქნება გაშვებული, აღმატებული მომხმარებლის გარეშე)." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) msgid "echo \"tor_setuid=YES\" >> /etc/rc.conf" -msgstr "" +msgstr "echo \"tor_setuid=YES\" >> /etc/rc.conf" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9539,7 +9563,7 @@ msgstr "echo \"tor_enable=YES\" >> /etc/rc.conf" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "service tor start" -msgstr "" +msgstr "service tor start" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9549,11 +9573,13 @@ msgid "" "To confirm your bridge is running with no issues, you should see something " "like this in `/var/log/tor/notices.log`:" msgstr "" +"იმის დასამოწმებლად, რომ თქვენი გადამცემი ხიდი გაშვებულია უხარვეზოდ, უნდა " +"ნახოთ ასეთი რამ ჩანაწერში `/var/log/tor/notices.log`:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "tail /var/log/tor/notices.log" -msgstr "" +msgstr "tail /var/log/tor/notices.log" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10239,7 +10265,7 @@ msgid "" "like this (`/var/log/tor/notices.log`):" msgstr "" "იმის დასამოწმებლად, რომ თქვენი გადამცემი ხიდი გაშვებულია უხარვეზოდ, უნდა " -"ნახოთასეტი რამ (`/var/log/tor/notices.log`):" +"ნახოთ ასეთი რამ (`/var/log/tor/notices.log`):" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.subtitle)

1 0

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

24 Aug '20

commit 365634b52157a82918ec64d35d78a6bd758f6bcd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 14:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index f598e9d5b7..21e500f7da 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -9271,7 +9271,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.title) msgid "DragonflyBSD" -msgstr "" +msgstr "DragonflyBSD" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.subtitle) @@ -9281,7 +9281,7 @@ msgstr "როგორ უნდა განთავსდეს obfs4-ხი #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "### 1. Bootstrap `pkg`" -msgstr "" +msgstr "### 1. ჩატვირთეთ `pkg`" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9701,16 +9701,19 @@ msgid "" " bridge configuration files with different sets of ports, and run `make " "deploy` again, like so:" msgstr "" +"თუ გსურთ რამდენიმე ხიდის გაშვება თქვენს მოწყობილობაზე, დაგჭირდებათ მეტი " +"გასამართი ფაილების შექმნა სხვადასხვა პორტებისთვის და `make deploy` " +"ბრძანების კვლავ გაშვება ამგვარად:" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "source bridge-1.sh && make deploy" -msgstr "" +msgstr "source bridge-1.sh && make deploy" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "source bridge-2.sh && make deploy" -msgstr "" +msgstr "source bridge-2.sh && make deploy" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -9720,7 +9723,7 @@ msgstr "..." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "### 3. Upgrade your container" -msgstr "" +msgstr "### 3. განაახლეთ სათავსი" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -9735,12 +9738,12 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "docker stop CONTAINER_ID" -msgstr "" +msgstr "docker stop CONTAINER_ID" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "docker rm CONTAINER_ID" -msgstr "" +msgstr "docker rm CONTAINER_ID" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -9749,6 +9752,9 @@ msgid "" "stored in a docker volume, so you won't lose your bridge's identity when " "upgrading to the latest docker image." msgstr "" +"გაითვალისწინეთ, რომ თქვენი ხიდის მონაცემთა საქაღალდე (რომელიც შეიცავს " +"გასაღებების მასალებს) ინახება docker-დანაყოფზე, ასე რომ არ დაკარგავთ თქვენი " +"ხიდის მოწმობას, docker-ის ბოლო გამოშვების ასლზე განახლებისას." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -9756,6 +9762,8 @@ msgid "" "If you are running multiple bridges on your computer, you need to repeat " "this step for each bridge." msgstr "" +"თუ რამდენიმე ხიდი გაქვთ გაშვებული კომპიუტერზე, უნდა გაიმეოროთ ეს საფეხური " +"თითოეული მათგანისთვის." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -9764,11 +9772,14 @@ msgid "" "dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing " "list." msgstr "" +"ჩვენ წინასწარ განვაცხადებთ ახალი ვერსიების შესახებ [tor-" +"dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) საფოსტო " +"ჯგუფში." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "You can inspect your bridge's logs by running:" -msgstr "" +msgstr "შეგიძლიათ გამოიკვლიოთ თქვენი გადამცემი ხიდის ჩანაწერები ბრძანებით:" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -9778,12 +9789,12 @@ msgstr "docker logs CONTAINER_ID" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "To use your new bridge in Tor Browser, you need its \"bridge line\"." -msgstr "" +msgstr "ახალი ხიდის Tor-ბრაუზერში გამოსაყენებლად, დაგჭირდებათ „სახიდე ხაზი“" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "Here's how you can get your bridge line:" -msgstr "" +msgstr "როგორ შეგიძლიათ მონახოთ სახიდე ხაზი:" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -9793,7 +9804,7 @@ msgstr "docker exec CONTAINER_ID get-bridge-line" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "This will return a string similar to the following:" -msgstr "" +msgstr "დააბრუნებს შემდეგნაირ ჩანაწერს:" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -9802,6 +9813,9 @@ msgid "" "cert=OYWq67L7MDApdJCctUAF7rX8LHvMxvIBPHOoAp0+YXzlQdsxhw6EapaMNwbbGICkpY8CPQ " "iat-mode=0" msgstr "" +"obfs4 1.2.3.4:1234 B0E566C9031657EA7ED3FC9D248E8AC4F37635A4 " +"cert=OYWq67L7MDApdJCctUAF7rX8LHvMxvIBPHOoAp0+YXzlQdsxhw6EapaMNwbbGICkpY8CPQ " +"iat-mode=0" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 24 Aug '20

24 Aug '20

commit 797eedf57dba9d2e657c42a49a49b6c9521abd40 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 14:18:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ka.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index bccfd2da1a..ca5adc50d5 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -3371,9 +3371,9 @@ msgid "" msgstr "" "თუ Tor-ბრაუზერი ჩამოტვირთული გაქვთ [ჩვენი მთავარი " "საიტიდან](https://www.torproject.org/ka/download/) ან გამოიყენეთ " -"[GetTor](https://gettor.torproject.org/), და [გადაამოწმებული " -"გაქვთ](https://support.torproject.org/tbb/how-to-verify-signature/), ეს " -"ყველაფერი ცრუ განგაშია და შეგიძლიათ არ იღელვოთ." +"[GetTor](https://gettor.torproject.org/), და [დამოწმებულიც " +"გაქვთ](https://support.torproject.org/tbb/how-to-verify-signature/), მაშინ " +"ეს ყველაფერი ცრუ განგაშია და შეგიძლიათ არ იღელვოთ." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description)

1 0

[snowflake/master] Update broker stats to include info on NAT types
by cohosh＠torproject.org 24 Aug '20

24 Aug '20

commit 3c3317503eb8e83bbf5bebff411bbd722e60ee2f Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Aug 19 11:37:43 2020 -0400 Update broker stats to include info on NAT types As we now partition proxies by NAT type, our stats are more useful if they capture how many proxies of each type we have, and information on whether we have enough proxies of the right NAT type for our clients. This change adds proxy counts by NAT type and binned counts of denied clients by NAT type. --- broker/broker.go | 23 ++++++++++- broker/metrics.go | 53 +++++++++++++++++++------ broker/snowflake-broker_test.go | 88 +++++++++++++++++++++++++++++++++++++---- broker/snowflake-heap.go | 1 + doc/broker-spec.txt | 34 +++++++++++++++- 5 files changed, 177 insertions(+), 22 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 99f6c69..983f95d 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -165,6 +165,7 @@ func (ctx *BrokerContext) AddSnowflake(id string, proxyType string, natType stri snowflake.id = id snowflake.clients = 0 snowflake.proxyType = proxyType + snowflake.natType = natType snowflake.offerChannel = make(chan *ClientOffer) snowflake.answerChannel = make(chan []byte) ctx.snowflakeLock.Lock() @@ -201,7 +202,7 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { log.Println("Error processing proxy IP: ", err.Error()) } else { ctx.metrics.lock.Lock() - ctx.metrics.UpdateCountryStats(remoteIP, proxyType) + ctx.metrics.UpdateCountryStats(remoteIP, proxyType, natType) ctx.metrics.lock.Unlock() } @@ -275,6 +276,11 @@ func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { if numSnowflakes <= 0 { ctx.metrics.lock.Lock() ctx.metrics.clientDeniedCount++ + if offer.natType == NATUnrestricted { + ctx.metrics.clientUnrestrictedDeniedCount++ + } else { + ctx.metrics.clientRestrictedDeniedCount++ + } ctx.metrics.lock.Unlock() w.WriteHeader(http.StatusServiceUnavailable) return @@ -357,6 +363,7 @@ func proxyAnswers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { func debugHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { var webexts, browsers, standalones, unknowns int + var natRestricted, natUnrestricted, natUnknown int ctx.snowflakeLock.Lock() s := fmt.Sprintf("current snowflakes available: %d\n", len(ctx.idToSnowflake)) for _, snowflake := range ctx.idToSnowflake { @@ -370,12 +377,26 @@ func debugHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { unknowns++ } + switch snowflake.natType { + case NATRestricted: + natRestricted++ + case NATUnrestricted: + natUnrestricted++ + default: + natUnknown++ + } + } ctx.snowflakeLock.Unlock() s += fmt.Sprintf("\tstandalone proxies: %d", standalones) s += fmt.Sprintf("\n\tbrowser proxies: %d", browsers) s += fmt.Sprintf("\n\twebext proxies: %d", webexts) s += fmt.Sprintf("\n\tunknown proxies: %d", unknowns) + + s += fmt.Sprintf("\nNAT Types available:") + s += fmt.Sprintf("\n\trestricted: %d", natRestricted) + s += fmt.Sprintf("\n\tunrestricted: %d", natUnrestricted) + s += fmt.Sprintf("\n\tunknown: %d", natUnknown) if _, err := w.Write([]byte(s)); err != nil { log.Printf("writing proxy information returned error: %v ", err) } diff --git a/broker/metrics.go b/broker/metrics.go index ea4d220..d1beae2 100644 --- a/broker/metrics.go +++ b/broker/metrics.go @@ -25,7 +25,12 @@ type CountryStats struct { badge map[string]bool webext map[string]bool unknown map[string]bool - counts map[string]int + + natRestricted map[string]bool + natUnrestricted map[string]bool + natUnknown map[string]bool + + counts map[string]int } // Implements Observable @@ -34,11 +39,13 @@ type Metrics struct { tablev4 *GeoIPv4Table tablev6 *GeoIPv6Table - countryStats CountryStats - clientRoundtripEstimate time.Duration - proxyIdleCount uint - clientDeniedCount uint - clientProxyMatchCount uint + countryStats CountryStats + clientRoundtripEstimate time.Duration + proxyIdleCount uint + clientDeniedCount uint + clientRestrictedDeniedCount uint + clientUnrestrictedDeniedCount uint + clientProxyMatchCount uint //synchronization for access to snowflake metrics lock sync.Mutex @@ -58,7 +65,7 @@ func (s CountryStats) Display() string { return output } -func (m *Metrics) UpdateCountryStats(addr string, proxyType string) { +func (m *Metrics) UpdateCountryStats(addr string, proxyType string, natType string) { var country string var ok bool @@ -111,6 +118,15 @@ func (m *Metrics) UpdateCountryStats(addr string, proxyType string) { m.countryStats.unknown[addr] = true } + switch natType { + case NATRestricted: + m.countryStats.natRestricted[addr] = true + case NATUnrestricted: + m.countryStats.natUnrestricted[addr] = true + default: + m.countryStats.natUnknown[addr] = true + } + } func (m *Metrics) LoadGeoipDatabases(geoipDB string, geoip6DB string) error { @@ -139,11 +155,14 @@ func NewMetrics(metricsLogger *log.Logger) (*Metrics, error) { m := new(Metrics) m.countryStats = CountryStats{ - counts: make(map[string]int), - standalone: make(map[string]bool), - badge: make(map[string]bool), - webext: make(map[string]bool), - unknown: make(map[string]bool), + counts: make(map[string]int), + standalone: make(map[string]bool), + badge: make(map[string]bool), + webext: make(map[string]bool), + unknown: make(map[string]bool), + natRestricted: make(map[string]bool), + natUnrestricted: make(map[string]bool), + natUnknown: make(map[string]bool), } m.logger = metricsLogger @@ -174,7 +193,12 @@ func (m *Metrics) printMetrics() { m.logger.Println("snowflake-ips-webext", len(m.countryStats.webext)) m.logger.Println("snowflake-idle-count", binCount(m.proxyIdleCount)) m.logger.Println("client-denied-count", binCount(m.clientDeniedCount)) + m.logger.Println("client-restricted-denied-count", binCount(m.clientRestrictedDeniedCount)) + m.logger.Println("client-unrestricted-denied-count", binCount(m.clientUnrestrictedDeniedCount)) m.logger.Println("client-snowflake-match-count", binCount(m.clientProxyMatchCount)) + m.logger.Println("snowflake-ips-nat-restricted", len(m.countryStats.natRestricted)) + m.logger.Println("snowflake-ips-nat-unrestricted", len(m.countryStats.natUnrestricted)) + m.logger.Println("snowflake-ips-nat-unknown", len(m.countryStats.natUnknown)) m.lock.Unlock() } @@ -182,12 +206,17 @@ func (m *Metrics) printMetrics() { func (m *Metrics) zeroMetrics() { m.proxyIdleCount = 0 m.clientDeniedCount = 0 + m.clientRestrictedDeniedCount = 0 + m.clientUnrestrictedDeniedCount = 0 m.clientProxyMatchCount = 0 m.countryStats.counts = make(map[string]int) m.countryStats.standalone = make(map[string]bool) m.countryStats.badge = make(map[string]bool) m.countryStats.webext = make(map[string]bool) m.countryStats.unknown = make(map[string]bool) + m.countryStats.natRestricted = make(map[string]bool) + m.countryStats.natUnrestricted = make(map[string]bool) + m.countryStats.natUnknown = make(map[string]bool) } // Rounds up a count to the nearest multiple of 8. diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index d03dca7..4e8e5f0 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -437,7 +437,7 @@ func TestGeoip(t *testing.T) { if err := ctx.metrics.LoadGeoipDatabases("invalid_filename", "invalid_filename6"); err != nil { log.Printf("loading geo ip databases returned error: %v", err) } - ctx.metrics.UpdateCountryStats("127.0.0.1", "") + ctx.metrics.UpdateCountryStats("127.0.0.1", "", NATUnknown) So(ctx.metrics.tablev4, ShouldEqual, nil) }) @@ -507,7 +507,7 @@ func TestMetrics(t *testing.T) { p.offerChannel <- nil <-done ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips CA=4\nsnowflake-ips-total 4\nsnowflake-ips-standalone 1\nsnowflake-ips-badge 1\nsnowflake-ips-webext 1\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips CA=4\nsnowflake-ips-total 4\nsnowflake-ips-standalone 1\nsnowflake-ips-badge 1\nsnowflake-ips-webext 1\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-restricted-denied-count 0\nclient-unrestricted-denied-count 0\nclient-snowflake-match-count 0\nsnowflake-ips-nat-restricted 0\nsnowflake-ips-nat-unrestricted 0\nsnowflake-ips-nat-unknown 1\n") }) @@ -521,13 +521,13 @@ func TestMetrics(t *testing.T) { clientOffers(ctx, w, r) ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 8\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldContainSubstring, "client-denied-count 8\nclient-restricted-denied-count 8\nclient-unrestricted-denied-count 0\nclient-snowflake-match-count 0") // Test reset buf.Reset() ctx.metrics.zeroMetrics() ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 0\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldContainSubstring, "snowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 0\nclient-restricted-denied-count 0\nclient-unrestricted-denied-count 0\nclient-snowflake-match-count 0\nsnowflake-ips-nat-restricted 0\nsnowflake-ips-nat-unrestricted 0\nsnowflake-ips-nat-unknown 0\n") }) //Test addition of client matches Convey("for client-proxy match", func() { @@ -548,7 +548,7 @@ func TestMetrics(t *testing.T) { <-done ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 0\nclient-snowflake-match-count 8\n") + So(buf.String(), ShouldContainSubstring, "client-denied-count 0\nclient-restricted-denied-count 0\nclient-unrestricted-denied-count 0\nclient-snowflake-match-count 8") }) //Test rounding boundary Convey("binning boundary", func() { @@ -567,12 +567,12 @@ func TestMetrics(t *testing.T) { clientOffers(ctx, w, r) ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 8\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldContainSubstring, "client-denied-count 8\nclient-restricted-denied-count 8\nclient-unrestricted-denied-count 0\n") clientOffers(ctx, w, r) buf.Reset() ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 16\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldContainSubstring, "client-denied-count 16\nclient-restricted-denied-count 16\nclient-unrestricted-denied-count 0\n") }) //Test unique ip @@ -605,7 +605,79 @@ func TestMetrics(t *testing.T) { <-done ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips CA=1\nsnowflake-ips-total 1\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldContainSubstring, "snowflake-ips CA=1\nsnowflake-ips-total 1") + }) + //Test NAT types + Convey("proxy counts by NAT type", func() { + w := httptest.NewRecorder() + data := bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.2","Type":"unknown","NAT":"restricted"}`)) + r, err := http.NewRequest("POST", "snowflake.broker/proxy", data) + r.RemoteAddr = "129.97.208.23:8888" //CA geoip + So(err, ShouldBeNil) + go func(ctx *BrokerContext) { + proxyPolls(ctx, w, r) + done <- true + }(ctx) + p := <-ctx.proxyPolls //manually unblock poll + p.offerChannel <- nil + <-done + + ctx.metrics.printMetrics() + So(buf.String(), ShouldContainSubstring, "snowflake-ips-nat-restricted 1\nsnowflake-ips-nat-unrestricted 0\nsnowflake-ips-nat-unknown 0") + + data = bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.2","Type":"unknown","NAT":"unrestricted"}`)) + r, err = http.NewRequest("POST", "snowflake.broker/proxy", data) + if err != nil { + log.Printf("unable to get NewRequest with error: %v", err) + } + r.RemoteAddr = "129.97.208.24:8888" //CA geoip + go func(ctx *BrokerContext) { + proxyPolls(ctx, w, r) + done <- true + }(ctx) + p = <-ctx.proxyPolls //manually unblock poll + p.offerChannel <- nil + <-done + + ctx.metrics.printMetrics() + So(buf.String(), ShouldContainSubstring, "snowflake-ips-nat-restricted 1\nsnowflake-ips-nat-unrestricted 1\nsnowflake-ips-nat-unknown 0") + }) + //Test client failures by NAT type + Convey("client failures by NAT type", func() { + w := httptest.NewRecorder() + data := bytes.NewReader([]byte("test")) + r, err := http.NewRequest("POST", "snowflake.broker/client", data) + r.Header.Set("Snowflake-NAT-TYPE", "restricted") + So(err, ShouldBeNil) + + clientOffers(ctx, w, r) + + ctx.metrics.printMetrics() + So(buf.String(), ShouldContainSubstring, "client-denied-count 8\nclient-restricted-denied-count 8\nclient-unrestricted-denied-count 0\nclient-snowflake-match-count 0") + + buf.Reset() + ctx.metrics.zeroMetrics() + + r, err = http.NewRequest("POST", "snowflake.broker/client", data) + r.Header.Set("Snowflake-NAT-TYPE", "unrestricted") + So(err, ShouldBeNil) + + clientOffers(ctx, w, r) + + ctx.metrics.printMetrics() + So(buf.String(), ShouldContainSubstring, "client-denied-count 8\nclient-restricted-denied-count 0\nclient-unrestricted-denied-count 8\nclient-snowflake-match-count 0") + + buf.Reset() + ctx.metrics.zeroMetrics() + + r, err = http.NewRequest("POST", "snowflake.broker/client", data) + r.Header.Set("Snowflake-NAT-TYPE", "unknown") + So(err, ShouldBeNil) + + clientOffers(ctx, w, r) + + ctx.metrics.printMetrics() + So(buf.String(), ShouldContainSubstring, "client-denied-count 8\nclient-restricted-denied-count 8\nclient-unrestricted-denied-count 0\nclient-snowflake-match-count 0") }) }) } diff --git a/broker/snowflake-heap.go b/broker/snowflake-heap.go index 12fe557..16dd264 100644 --- a/broker/snowflake-heap.go +++ b/broker/snowflake-heap.go @@ -11,6 +11,7 @@ over the offer and answer channels. type Snowflake struct { id string proxyType string + natType string offerChannel chan *ClientOffer answerChannel chan []byte clients int diff --git a/doc/broker-spec.txt b/doc/broker-spec.txt index c3177e0..9e4b8ae 100644 --- a/doc/broker-spec.txt +++ b/doc/broker-spec.txt @@ -8,7 +8,7 @@ The Snowflake broker is used to hand out Snowflake proxies to clients using the This document specifies how the Snowflake broker interacts with other parts of the Tor ecosystem, starting with the metrics CollecTor module and to be expanded upon later. -1. Metrics Reporting (version 1.0) +1. Metrics Reporting (version 1.1) Metrics data from the Snowflake broker can be retrieved by sending an HTTP GET request to https://[Snowflake broker URL]/metrics and consists of the following items: @@ -62,12 +62,44 @@ Metrics data from the Snowflake broker can be retrieved by sending an HTTP GET r from the broker but no proxies were available, rounded up to the nearest multiple of 8. + "client-restricted-denied-count" NUM NL + [At most once.] + + A count of the number of times a client with a restricted or + unknown NAT type has requested a proxy from the broker but no + proxies were available, rounded up to the nearest multiple of 8. + + "client-unrestricted-denied-count" NUM NL + [At most once.] + + A count of the number of times a client with an unrestricted NAT + type has requested a proxy from the broker but no proxies were + available, rounded up to the nearest multiple of 8. + "client-snowflake-match-count" NUM NL [At most once.] A count of the number of times a client successfully received a proxy from the broker, rounded up to the nearest multiple of 8. + "snowflake-ips-nat-restricted" NUM NL + [At most once.] + + A count of the total number of unique IP addresses of snowflake + proxies that have a restricted NAT type. + + "snowflake-ips-nat-unrestricted" NUM NL + [At most once.] + + A count of the total number of unique IP addresses of snowflake + proxies that have an unrestricted NAT type. + + "snowflake-ips-nat-unknown" NUM NL + [At most once.] + + A count of the total number of unique IP addresses of snowflake + proxies that have an unknown NAT type. + 2. Broker messaging specification and endpoints The broker facilitates the connection of snowflake clients and snowflake proxies

1 0

[translation/whisperback_release] https://gitweb.torproject.org/translation.git/commit/?h=whisperback_release
by translation＠torproject.org 24 Aug '20

24 Aug '20

commit 503b9038bf54dfbb6daad1d8096d62adfab72665 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 09:18:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=whisperback_release --- sv/sv.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 84678e93cb..0e02f3222a 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -4,6 +4,7 @@ # # Translators: # cryptohead <cryptohead(a)gmail.com>, 2013 +# Felix Bergman <felix9801(a)hotmail.com>, 2020 # Jacob Andersson <jacob.c.andersson(a)protonmail.com>, 2017 # Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2017 # Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2018-2020 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2020-04-08 15:22+0000\n" -"Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>\n" +"PO-Revision-Date: 2020-08-24 09:15+0000\n" +"Last-Translator: Felix Bergman <felix9801(a)hotmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback
by translation＠torproject.org 24 Aug '20

24 Aug '20

commit 8ec7fe7e033173667038fe977b6418a6a824ddb8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 09:17:55 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- sv/sv.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index d11b587f33..9df433cff0 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -4,18 +4,19 @@ # # Translators: # cryptohead <cryptohead(a)gmail.com>, 2013 +# Felix Bergman <felix9801(a)hotmail.com>, 2020 # Jacob Andersson <jacob.c.andersson(a)protonmail.com>, 2017 -# Jonatan Nyberg, 2017 -# Jonatan Nyberg, 2018-2020 -# leveebreaks, 2014 +# Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2017 +# Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2018-2020 +# 0848eda738c5b7991c82fe32ea145d37_6f8c5b1, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2020-04-08 15:22+0000\n" -"Last-Translator: Jonatan Nyberg\n" +"PO-Revision-Date: 2020-08-24 09:15+0000\n" +"Last-Translator: Felix Bergman <felix9801(a)hotmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -233,4 +234,4 @@ msgstr "Skicka återkoppling via krypterad e-post" #: ../data/whisperback.desktop.in.h:3 msgid "feedback;bug;report;tails;error;" -msgstr "" +msgstr "feedback;bugg;rapport;tails;fel;"

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 24 Aug '20

24 Aug '20

commit 8cadfdbfaac5638f49e90b351a7eefd95ef6b63f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 08:18:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contents+es-AR.po b/contents+es-AR.po index a32c9684e9..18d7325043 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -2778,6 +2778,8 @@ msgid "" "Somebody might impersonate us, or break into our computers, or something " "like that." msgstr "" +"Alguien podría hacerse pasar por nosotros, o ingresar forzosamente en " +"nuestras computadoras, o algo así." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -2785,6 +2787,8 @@ msgid "" "Tor is open source, and you should always check the source (or at least the " "diffs since the last release) for suspicious things." msgstr "" +"Tor es código abierto, y siempre debieras comprobar la fuente (o al menos " +"los diffs desde la última versión) por cosas suspechosas." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -2792,6 +2796,9 @@ msgid "" "If we (or the distributors that gave you Tor) don't give you access to the " "source code, that's a sure sign something funny might be going on." msgstr "" +"Si nosotros (o los distribuidores que te dieron Tor) no te damos acceso al " +"código fuente, eso es un signo seguro de que algo inusual podría estar " +"ocurriendo." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -2799,6 +2806,9 @@ msgid "" "You should also check the [PGP signatures](/tbb/how-to-verify-signature/) on" " the releases, to make sure nobody messed with the distribution sites." msgstr "" +"También debieras comprobar las [firmas PGP](/tbb/how-to-verify-signature/) " +"en los lanzamientos, para estar seguro de que nadie interfirió con los " +"sitios de distribución." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 24 Aug '20

24 Aug '20

commit 9caa62543bf087b5d83aefe269cef57ddc40d5b7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 07:48:10 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index e7d32b2b08..a32c9684e9 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -2678,21 +2678,24 @@ msgid "" "there are near you and the more diverse their interests, the less dangerous " "it will be that you are one of them." msgstr "" +"Últimamente, la mejor protección es un abordaje social: cuantos más usuarios" +" Tor haya cerca tuyo y más diversos sean sus intereses, menos peligroso será" +" que seas uno de ellos." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "Convince other people to use Tor, too!" -msgstr "" +msgstr "¡Convencé a otra gente para que también use Tor!" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "Be smart and learn more." -msgstr "" +msgstr "Avivate y aprendé más." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "Understand what Tor does and does not offer." -msgstr "" +msgstr "Entendé qué hace Tor, y qué es lo que no ofrece." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2700,16 +2703,19 @@ msgid "" "This list of pitfalls isn't complete, and we need your help [identifying and" " documenting all the issues](https://community.torproject.org/)." msgstr "" +"Esta lista de problemas no está completa, y necesitamos tu ayuda para " +"[identificar y documentar todas estas " +"cuestiones](https://community.torproject.org/)." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.title) msgid "Is there a backdoor in Tor?" -msgstr "" +msgstr "¿Hay una puerta trasera en Tor?" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "There is absolutely no backdoor in Tor." -msgstr "" +msgstr "No hay en lo absoluto puertas traseras en Tor." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -2717,17 +2723,21 @@ msgid "" "We know some smart lawyers who say that it's unlikely that anybody will try " "to make us add one in our jurisdiction (U.S.)." msgstr "" +"Conocemos a algunos abogados vivos que dicen que no es probable que alguien " +"trate de hacernos agregar una en nuestra jurisdicción (EE.UU.)." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "" "If they do ask us, we will fight them, and (the lawyers say) probably win." msgstr "" +"Si nos lo solicitan, vamos a pelear, y (dicen los abogados) probablemente " +"ganemos." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "We will never put a backdoor in Tor." -msgstr "" +msgstr "Nunca vamos a poner una puerta trasera en Tor." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -2735,6 +2745,9 @@ msgid "" "We think that putting a backdoor in Tor would be tremendously irresponsible " "to our users, and a bad precedent for security software in general." msgstr "" +"Pensamos que poner una puerta trasera en Tor sería tremendamente " +"irresponsable para nuestros usuarios, y un mal precedente para el software " +"de seguridad en general." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -2742,17 +2755,22 @@ msgid "" "If we ever put a deliberate backdoor in our security software, it would ruin" " our professional reputation." msgstr "" +"Si alguna vez ponemos una puerta trasera deliberada en nuestro software de " +"seguridad, arruinaría nuestra reputación profesional." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "Nobody would trust our software ever again - for excellent reasons!" msgstr "" +"Nadie confiaría en nuestro software, nunca más - ¡por excelentes razones!" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "" "But that said, there are still plenty of subtle attacks people might try." msgstr "" +"Pero dicho eso, todavía hay multitud de ataques sutiles que la gente podría " +"intentar." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 24 Aug '20

24 Aug '20

commit f58ddaeb8a2b5b2817375ec8d148f671c8f8ba30 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 07:18:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index ce45ec0802..e7d32b2b08 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -2534,6 +2534,8 @@ msgid "" "encryption of your traffic to the final destination website depends upon on " "that website." msgstr "" +"Tor encriptará tu tráfico hacia y dentro de la red Tor, pero el encriptado " +"de tu tráfico hasta el sitio web de destino final depende de este último." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2542,6 +2544,10 @@ msgid "" "Everywhere](https://www.eff.org/https-everywhere) to force the use of HTTPS " "encryption with major websites that support it." msgstr "" +"Para ayudar a segurar la encriptación privada hacia los sitios web, el " +"Navegador Tor incluye [HTTPS Everywhere](https://www.eff.org/https-" +"everywhere), para forzar el uso de encriptación HTTPS con los sitios web de " +"envergadura que lo soportan." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2553,6 +2559,12 @@ msgid "" " address bar, include **https://** in the URL, and display the proper " "expected name for the website." msgstr "" +"Sin embargo, aún así debieras observar la barra URL del navegador para " +"asegurarte que los sitios web a los que les das información delicada " +"muestren un [candado](https://support.mozilla.org/en-US/kb/how-do-i-tell-if-" +"my-connection-is-secure) o [icono cebolla](/onionservices/onionservices-5) " +"en la barra de direcciones, incluyan **https://** en el URL y muestren el " +"nombre esperado apropiado para el sitio web." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2560,11 +2572,14 @@ msgid "" "Also see EFF's interactive graphic explaining [how Tor and HTTPS " "relate](/https/https-1)." msgstr "" +"También, mirá el gráfico interactivo de la EFF explicando [cómo Tor y HTTPS " +"se relacionan](/https/https-1)." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Don't open documents downloaded through Tor while online" msgstr "" +"### No abras documentos descargados a través de Tor mientras estés en línea" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2572,11 +2587,13 @@ msgid "" "Tor Browser will warn you before automatically opening documents that are " "handled by external applications." msgstr "" +"El Navegador Tor te advertirá antes de abrir automáticamente documentos que " +"son manejados por aplicaciones externas." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "**DO NOT IGNORE THIS WARNING**." -msgstr "" +msgstr "**NO IGNORÉS ESTA ADVERTENCIA**." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2586,11 +2603,15 @@ msgid "" "Browser) as these documents can contain Internet resources that will be " "downloaded outside of Tor by the application that opens them." msgstr "" +"Debieras ser muy cuidadoso cuando descargues documentos vía Tor " +"(especialmente archivos DOC y PDF, a menos que usés el visor PDF incorporado" +" en el Navegador Tor) ya que estos documentos pueden contener recursos de " +"Internet que serán descargados fuera de Tor por la aplicación que los abre." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "This will reveal your non-Tor IP address." -msgstr "" +msgstr "Esto revelará tu dirección IP no proporcionada por Tor." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2600,6 +2621,10 @@ msgid "" "[dangerzone](https://github.com/firstlookmedia/dangerzone) to create safe " "PDF files that you can open." msgstr "" +"Si debés trabajar con archivos descargados vía Tor, recomendamos " +"enfáticamente que usés una computadora desconectada, o bien usés " +"[dangerzone](https://github.com/firstlookmedia/dangerzone) para crear " +"archivos PDF seguros, que puedas abrir." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2608,11 +2633,14 @@ msgid "" "Tor](https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea) " "together, however." msgstr "" +"Sin embargo, bajo ninguna circunstancia es seguro usar [BitTorrent y " +"Tor](https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea) " +"juntos." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Use bridges and/or find company" -msgstr "" +msgstr "### Usá puentes y/o encontrá compañía" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2620,6 +2648,8 @@ msgid "" "Tor tries to prevent attackers from learning what destination websites you " "connect to." msgstr "" +"Tor intenta prevenir que los atacantes aprendan a qué sitios web de destino " +"te conectás." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2627,6 +2657,8 @@ msgid "" "However, by default, it does not prevent somebody watching your Internet " "traffic from learning that you're using Tor." msgstr "" +"Sin embargo, por defecto, no previene que alguien observando tu tráfico de " +"Internet sepa que estás usando Tor." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2635,6 +2667,9 @@ msgid "" " [bridge](https://tb-manual.torproject.org/bridges/) rather than connecting " "directly to the Tor network." msgstr "" +"Si esto te importa, podés reducir este riesgo configurando a Tor para que " +"use un [puente](https://tb-manual.torproject.org/bridges/), en vez de " +"conectar directamente a la red Tor." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0