- tor-commits - lists.torproject.org

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit 1d04c1fc55d1010ef79bfff5ef4e0300e21d8238 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 15:45:20 2022 +0000 new translations in communitytpo-contentspot --- contents+zh-TW.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 7c98b42269..81f3b4c7b2 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -2008,7 +2008,7 @@ msgstr "index index.html;" #: https//community.torproject.org/onion-services/advanced/onion-location/ #: (content/onion-services/advanced/onion-location/contents+en.lrpage.body) msgid "root /path/to/htdocs;" -msgstr "root /path/to/htdocs;" +msgstr "root /檔案/htdocs/的/路徑;" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -2024,7 +2024,7 @@ msgstr "}" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "Or in Apache with Tor service listening on port 80:" -msgstr "" +msgstr "或者是以Apache跑洋蔥服務並傾聽第80連接埠號：" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body)

1 0

[translation/tails-misc_release] new translations in tails-misc_release
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit 379d87cf17d2e6f62103d576c3841d55614abb87 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 15:18:03 2022 +0000 new translations in tails-misc_release --- is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is.po b/is.po index 94cba493a9..5c53c3d776 100644 --- a/is.po +++ b/is.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-10 09:34+0100\n" -"PO-Revision-Date: 2022-01-25 11:59+0000\n" +"PO-Revision-Date: 2022-01-25 14:56+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] new translations in tails-misc
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit ddcfd8239207d24256f94701062c9e621073b039 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 15:16:24 2022 +0000 new translations in tails-misc --- is.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/is.po b/is.po index 5b86e141bf..5a43e098d4 100644 --- a/is.po +++ b/is.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-10 09:34+0100\n" -"PO-Revision-Date: 2022-01-25 11:59+0000\n" +"PO-Revision-Date: 2022-01-25 14:56+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n" @@ -2734,14 +2734,14 @@ msgstr "<b>Tengjast sjálfkrafa við Tor (_auðveldara)</b>" msgid "" "We recommend connecting to Tor automatically if you are on a public Wi-Fi " "network or if many people in your country use Tor to circumvent censorship." -msgstr "" +msgstr "Við mælum með því að tengjast sjálfkrafa við Tor ef þú ert á Wi-Fi almenningsneti eða ef margir í landinu þínu nota Tor til að komast framhjá ritskoðun." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1114 msgid "" "Tails will try different ways of connecting to Tor until it succeeds.\n" "\n" "Someone monitoring your Internet connection could identify these attempts as coming from a Tails user." -msgstr "" +msgstr "Tails mun prófa mismunandi aðferðir við að tengjast Tor þar til það tekst.\n\nEinhver sem væri að fylgjast með internettengingunni þinni gæti séð að þetta kæmi frá Tails-notanda." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1148 msgid "Configure a Tor _bridge"

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit c3ea363b28ae5d0ec11dd9411c96601b094e7f7f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 15:15:15 2022 +0000 new translations in communitytpo-contentspot --- contents+zh-TW.po | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index ef26ce8e5a..7c98b42269 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -1819,7 +1819,7 @@ msgstr "如果洋蔥路由有正常被啟動的話，那就表示一切都順利 msgid "" "It will print some warnings or error messages. That should give you an idea " "of what went wrong." -msgstr "" +msgstr "它裡面會有一些警告或錯誤訊息，以便讓您知道可能是哪裡出問題。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1828,105 +1828,106 @@ msgid "" "(See the [logging FAQ](https://www.torproject.org/docs/faq#Logs) entry if " "you don't know how to enable or find your log file.)" msgstr "" +"常見的錯誤都是`torrc`裡有字打錯，或者是檔案目錄的權限不足，(若您不知道如何查閱歷程記錄的話，請參考[歷程記錄問答集](https://www.…" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "When Tor starts, it will automatically create the `HiddenServiceDir` that " "you specified (if necessary)." -msgstr "" +msgstr "當洋蔥路由啟動時，它會自動建立您在`HiddenServiceDir`所指定的目錄(若不存在的話)，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "Make sure this is the case." -msgstr "" +msgstr "請確認此部份是否正確。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 4: Test that your onion service works" -msgstr "" +msgstr "## 第4步：測試您的洋蔥服務是否正常" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "Now to get your onion service address, go to your `HiddenServiceDir` " "directory, and find a file named `hostname`." -msgstr "" +msgstr "現在必須要取得您的洋蔥服務位址，請到您在`HiddenServiceDir`所指定的目錄中，尋找一個叫做`hostname`的檔案。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "The `hostname` file in your onion service configuration directory contains " "the hostname for your new onion v3 service." -msgstr "" +msgstr "在您的洋蔥服務設定目錄裡的`hostname`檔案，會含有您的v3版洋蔥服務的主機名稱，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "The other files are your onion service keys, so it is imperative that these " "are kept private." -msgstr "" +msgstr "至於其他幾個檔案則是您的洋蔥服務金鑰，請務必將它們妥善保存且不要外洩。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "If your keys leak, other people can impersonate your onion service, deeming " "it compromised, useless, and dangerous to visit." -msgstr "" +msgstr "若這些金鑰外洩的話，其他人就能夠偽裝成您的洋蔥服務，因此您的服務就等同於被駭，完全無法再使用，您的訪客也都會有危險。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "Now you can connect to your onion service using Tor Browser, and you should " "get the html page you setup back in **Step 1**." -msgstr "" +msgstr "現在您可以透過洋蔥路由瀏覽器來造訪您的洋蔥服務，此時您應該可以看見您在**第1步**裡所放置的那張HTML網頁。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "If it doesn't work, look in your logs for some hints, and keep playing with " "it until it works." -msgstr "" +msgstr "如果這裡有問題的話，請先查閱歷程記錄以了解情況，並再試著重新調整測試，直到一切都正常為止。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "It is important to note that an onion service configured like this will be " "readable by anybody who knows or discovers the address." -msgstr "" +msgstr "這裡您必須要注意，以這種方式架設起來的洋蔥服務是完全公開的，意即任何知道或者發現您的位址的人，都能夠讀取其內容。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "You can make onion services require authentication, and only users with a " "private key will access the service." -msgstr "" +msgstr "您也可以將您的洋蔥服務設定成需要認證授權，這樣就只有那些持有指定的祕密金鑰的訪客才能夠存取服務，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "Read more about [Client authorization](../advanced/client-auth/) " "documentation." -msgstr "" +msgstr "請參閱[客戶端認證](../advanced/client-auth/)文件以了解更多資訊。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## (Optional) Step 5: Running multiple onion services" -msgstr "" +msgstr "## (非必要)第5步：架設多個洋蔥服務" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "If you want to forward multiple virtual ports for a single onion service, " "just add more `HiddenServicePort` lines." -msgstr "" +msgstr "若您想要將來自多個不同虛擬連接埠的連線流量都導向到同一個洋蔥服務的話，只要寫入多行`HiddenServicePort`設定即可。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "If you want to run multiple onion services from the same Tor client, just " "add another `HiddenServiceDir` line." -msgstr "" +msgstr "若您想要在同一個洋蔥路由客戶端程式上執行多個洋蔥服務的話，只要寫入多行`HiddenServiceDir`設定即可。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1934,6 +1935,7 @@ msgid "" "All the following `HiddenServicePort` lines refer to this `HiddenServiceDir`" " line, until you add another `HiddenServiceDir` line:" msgstr "" +"除非您加入另一行`HiddenServiceDir`設定，否則底下的這幾行`HiddenServicePort`全都會參考到這個`HiddenServiceDir`設定：" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1961,14 +1963,14 @@ msgid "" "If you're running multiple onion sites on the same web server, remember to " "edit your web server virtual host file and add the onion address for each " "website." -msgstr "" +msgstr "若您在同一個網頁伺服器上架設多個洋蔥服務的話，請記得調整網頁伺服器的虛擬主機設定檔，為每個網站設定各自的洋蔥位址。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "For example, in Nginx and using Tor with Unix sockets, the configuration " "would look like this:" -msgstr "" +msgstr "舉例來說，如果在Nginx中以Unix Sockets來執行洋蔥路由的話，其設定值看起來會像是這樣：" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -2006,7 +2008,7 @@ msgstr "index index.html;" #: https//community.torproject.org/onion-services/advanced/onion-location/ #: (content/onion-services/advanced/onion-location/contents+en.lrpage.body) msgid "root /path/to/htdocs;" -msgstr "" +msgstr "root /path/to/htdocs;" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit 53d091acebf5bd5d878c790b3ee455c5c321e051 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 14:45:11 2022 +0000 new translations in communitytpo-contentspot --- contents+zh-TW.po | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 338c20a1b0..ef26ce8e5a 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -1543,20 +1543,21 @@ msgid "" "since even if you already have one installed, you may be using it (or want " "to use it later) for a regular website." msgstr "" +"即使您已經有一個安裝設定完成的網頁伺服器，我們還是會建議您為洋蔥服務安裝另一個全新且獨立的網頁伺服器，因為您可能還要(或者未來打算)用它來當普通的網站。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "On this page, the commands to manage the web server are based on Debian-like" " operating systems and may differ from other systems." -msgstr "" +msgstr "在這篇教學裡，都是以Debian為基礎的作業系統上的指令來管理網頁伺服器，這些指令在其他系統上可能會有所差異，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) #: https//community.torproject.org/onion-services/advanced/onion-location/ #: (content/onion-services/advanced/onion-location/contents+en.lrpage.body) msgid "Check your web server and operating system documentation." -msgstr "" +msgstr "請查閱您的作業系統與網頁伺服器的相關文件。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1570,12 +1571,12 @@ msgstr "### Apache" msgid "" "Apache is available in the main repository of multiple Linux and *BSD " "distributions." -msgstr "" +msgstr "在許多Linux以及BSD系統的發行版裡，其官方套件庫都有提供Apache軟體，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "To install `apache2` package:" -msgstr "" +msgstr "安裝`apache2`套件：" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1594,12 +1595,12 @@ msgstr "### Nginx" msgid "" "Nginx is available in the main repository of multiple Linux and *BSD " "distributions." -msgstr "" +msgstr "在許多Linux以及BSD系統的發行版裡，其官方套件庫都有提供Nginx軟體，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "To install `nginx` package:" -msgstr "" +msgstr "安裝`nginx`套件：" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1611,7 +1612,7 @@ msgstr "`$ sudo apt install nginx`" msgid "" "By default, the web server will be running on `localhost:80` at the end of " "the installation." -msgstr "" +msgstr "在預設的狀態下，網頁伺服器會在安裝完成後，會將服務開啟於`localhost:80`。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1629,38 +1630,38 @@ msgstr "如果您有看到錯誤訊息的話，那就表示有地方做錯了， msgid "" "Once your web server is set up, make sure it works: open your browser and go" " to http://localhost/." -msgstr "" +msgstr "架設起網頁伺服器後，請先確定它有正常運行：用瀏覽器開啟 http://localhost/ 。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "Then try putting a file in the main html directory, and make sure it shows " "up when you access the site." -msgstr "" +msgstr "接著請嘗試在主要HTML目錄中放置一個檔案，確認當存取網頁服務時，該檔案有正確出現。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 2: Configure your Tor onion service" -msgstr "" +msgstr "## 第2步：設定您的洋蔥服務" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "The next step is opening the config file of Tor (torrc) and doing the " "appropriate configurations to setup an onion service." -msgstr "" +msgstr "接下來就是要開啟洋蔥路由的設定檔(torrc)進行適當的調整，以便架設起洋蔥服務。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "Depending on your operating system and setup, your Tor configuration file " "can be at a different location or look different." -msgstr "" +msgstr "隨著您的作業系統與相關設定不同，洋蔥路由的設定檔可能位於不同的目錄或外觀，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "You will need to put the following two lines in your `torrc` file:" -msgstr "" +msgstr "您需要將底下兩行設定加入您的`torrc`設定檔中：" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1677,7 +1678,7 @@ msgstr "HiddenServicePort 80 127.0.0.1:80" msgid "" "The `HiddenServiceDir` line specifies the directory which should contain " "information and cryptographic keys for your onion service." -msgstr "" +msgstr "在`HiddenServiceDir`這行的設定裡，是要指定您的洋蔥服務所使用的密碼學金鑰相關資訊的所在目錄，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1685,7 +1686,7 @@ msgid "" "You will want to change the `HiddenServiceDir` line, so that it points to an" " actual directory that is readable/writeable by the user that will be " "running Tor." -msgstr "" +msgstr "您會需要調整`HiddenServiceDir`的設定值，以便讓它指向一個執行洋蔥服務的使用者帳號有讀取與寫入權限的目錄。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1696,6 +1697,7 @@ msgid "" "should be redirected to `127.0.0.1:80` (which is where the web server from " "step 1 is listening)." msgstr "" +"在`HiddenServicePort`這行設定裡，是要指定一個_虛擬連接埠號_(也就是訪客要連上您的洋蔥服務時所使用的埠號)，在上述的範例中，會把所有來自洋蔥服務第80埠號的連線流量，都重新導向至`127.0.0.1:80`(這也是在第1步裡設定的網頁伺服器所傾聽的埠號)。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1703,12 +1705,13 @@ msgid "" "**Tip:** A good practice to avoid leaking an onion service to a local " "network is to run onion services over Unix sockets instead of a TCP socket." msgstr "" +"**提示：** 要避免您的洋蔥服務在本地端區域網路中洩漏的最佳實務作法，是利用Unix Sockets來跑洋蔥服務，不要使用TCP Socket。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "You will need to edit and put the following two lines in your `torrc` file:" -msgstr "" +msgstr "您會需要在`torrc`設定檔裡加入這兩行設定：" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1792,12 +1795,12 @@ msgstr "HiddenServicePort 80 unix:/var/run/tor-my-website.sock" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 3: Restart Tor and check that it worked" -msgstr "" +msgstr "## 第3步：重新啟動洋蔥路由並確認是否有正常運行" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "Now save your `torrc` and restart Tor." -msgstr "" +msgstr "將`torrc`的變更儲存並重新啟動洋蔥路由。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1809,7 +1812,7 @@ msgstr "`$ sudo systemctl restart tor`" msgid "" "If Tor starts up again, great. Otherwise, something is wrong. First look at " "your logfiles for hints." -msgstr "" +msgstr "如果洋蔥路由有正常被啟動的話，那就表示一切都順利，否則的話，就代表有地方出錯了，請先查閱您的歷程記錄檔以了解情況，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit dc90052a5825d3525c6e91ef4ec46ed85cc94a84 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 14:15:11 2022 +0000 new translations in communitytpo-contentspot --- contents+zh-TW.po | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index dc54246376..338c20a1b0 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -1427,6 +1427,8 @@ msgid "" "- The [Tor design paper](https://svn.torproject.org/svn/projects/design-" "paper/tor-design.pdf) describing the original design." msgstr "" +"- 在[Tor design paper](https://svn.torproject.org/svn/projects/design-" +"paper/tor-design.pdf)這篇論文裡，詳細描述了最初的原始設計。" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1435,6 +1437,9 @@ msgid "" "services](https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt) " "protocol specification." msgstr "" +"- [Tor v3 onion " +"services](https://gitweb.torproject.org/torspec.git/tree/rend-" +"spec-v3.txt)是通訊協定的規格書。" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1445,6 +1450,10 @@ msgid "" "Dingledine - Next Generation Tor Onion " "Services](https://www.youtube.com/watch?v=Di7qAVidy1Y)." msgstr "" +"- 有關洋蔥服務的簡介：[Understanding Tor Onion Services and Their Use Cases - HOPE XI " +"2016](https://www.youtube.com/watch?v=VmsFxBEN3fc)、[DEF CON 25 - Roger " +"Dingledine - Next Generation Tor Onion " +"Services](https://www.youtube.com/watch?v=Di7qAVidy1Y)。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.cta) @@ -1456,58 +1465,58 @@ msgstr "開始" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "This guide shows you how to set up an onion service for your website." -msgstr "" +msgstr "這份指引會說明如何為您的網站架設洋蔥服務，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "For the technical details of how the onion service protocol works, see our " "onion service protocol page." -msgstr "" +msgstr "若想了解洋蔥服務協定的運作原理，請參閱我們洋蔥服務協定的網頁。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 0: Get a working Tor" -msgstr "" +msgstr "## 第0步：架起洋蔥路由" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "As part of this guide, we will assume you have a functional Tor in your " "machine." -msgstr "" +msgstr "在這裡，我們假定您已經在電腦上架起可以正常運行的洋蔥路由，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "To set up Tor, please follow the [Tor installation guide](./install/)." -msgstr "" +msgstr "若想要架設洋蔥路由，請依照[洋蔥路由安裝指南](./install/)的步驟指引，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "Tor should be up and running correctly for this guide to work." -msgstr "" +msgstr "它可以讓您架起可以正常運行的洋蔥路由，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "You should also know where Tor's configuration files are." -msgstr "" +msgstr "同時您也必須要熟知洋蔥路由的設定檔位置。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 1: Get a web server working" -msgstr "" +msgstr "## 第1步：架起可正常使用的網頁伺服器" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "As a first step, you should set up a web server locally, like Nginx, Apache," " or your favorite web server." -msgstr "" +msgstr "第一步所要做的，是先在本地端主機架設起一個網頁伺服器，像是Nginx、Apache或任何您打算使用的網頁伺服器系統。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "Setting up a web server can be complex." -msgstr "" +msgstr "網頁伺服器的架設會有點複雜，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -1516,13 +1525,16 @@ msgid "" "our [tor-onions](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" "onions) mailing list to speak with other operators." msgstr "" +"若您在這裡卡住或希望特別做其他的調整，可以找個朋友協助，或者是加入我們的[tor-" +"onions](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" +"onions)郵件通訊清單，以跟其他維運者對話。" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "As an example, we will cover how to set up an onion site with Nginx and " "Apache on Debian." -msgstr "" +msgstr "在這裡我們會以Debian系統上的Nginx以及Apache為範例，說明如何架設洋蔥站台，" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body)

1 0

[snowflake/main] Add Event Bus Test
by shelikhoo＠torproject.org 25 Jan '22

25 Jan '22

commit b5ef18803f08364db15ba66b0189371d5e79d821 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Fri Nov 26 16:24:21 2021 +0000 Add Event Bus Test --- common/event/bus_test.go | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/common/event/bus_test.go b/common/event/bus_test.go new file mode 100644 index 0000000..df40d3d --- /dev/null +++ b/common/event/bus_test.go @@ -0,0 +1,32 @@ +package event + +import ( + "github.com/stretchr/testify/assert" + "testing" +) + +type stubReceiver struct { + counter int +} + +func (s *stubReceiver) OnNewSnowflakeEvent(event SnowflakeEvent) { + s.counter++ +} + +func TestBusDispatch(t *testing.T) { + EventBus := NewSnowflakeEventDispatcher() + StubReceiverA := &stubReceiver{} + StubReceiverB := &stubReceiver{} + EventBus.AddSnowflakeEventListener(StubReceiverA) + EventBus.AddSnowflakeEventListener(StubReceiverB) + assert.Equal(t, 0, StubReceiverA.counter) + assert.Equal(t, 0, StubReceiverB.counter) + EventBus.OnNewSnowflakeEvent(EventOnSnowflakeConnected{}) + assert.Equal(t, 1, StubReceiverA.counter) + assert.Equal(t, 1, StubReceiverB.counter) + EventBus.RemoveSnowflakeEventListener(StubReceiverB) + EventBus.OnNewSnowflakeEvent(EventOnSnowflakeConnected{}) + assert.Equal(t, 2, StubReceiverA.counter) + assert.Equal(t, 1, StubReceiverB.counter) + +}

1 0

[snowflake/main] Add Snowflake Event Reporter for Broker Communication
by shelikhoo＠torproject.org 25 Jan '22

25 Jan '22

commit c3f09994daa5a512a6d6cea026aeb15162d5d866 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 13 14:10:06 2021 +0000 Add Snowflake Event Reporter for Broker Communication --- client/lib/webrtc.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index f4b775c..3b496d0 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -9,6 +9,7 @@ import ( "sync" "time" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "github.com/pion/webrtc/v3" ) @@ -31,7 +32,8 @@ type WebRTCPeer struct { once sync.Once // Synchronization for PeerConnection destruction - bytesLogger bytesLogger + bytesLogger bytesLogger + eventsLogger event.SnowflakeEventReceiver } // NewWebRTCPeer constructs a WebRTC PeerConnection to a snowflake proxy. @@ -131,10 +133,21 @@ func (c *WebRTCPeer) connect(config *webrtc.Configuration, broker *BrokerChannel log.Println(c.id, " connecting...") // TODO: When go-webrtc is more stable, it's possible that a new // PeerConnection won't need to be re-prepared each time. - if err := c.preparePeerConnection(config); err != nil { + err := c.preparePeerConnection(config) + localDescription := c.pc.LocalDescription() + c.eventsLogger.OnNewSnowflakeEvent(event.EventOnOfferCreated{ + WebRTCLocalDescription: localDescription, + Error: err, + }) + if err != nil { return err } - answer, err := broker.Negotiate(c.pc.LocalDescription()) + + answer, err := broker.Negotiate(localDescription) + c.eventsLogger.OnNewSnowflakeEvent(event.EventOnBrokerRendezvous{ + WebRTCRemoteDescription: answer, + Error: err, + }) if err != nil { return err }

1 0

[snowflake/main] Add snowflake event handler to client config
by shelikhoo＠torproject.org 25 Jan '22

25 Jan '22

commit cd6d837d85bb915d77bf122a82bb161c9d68cf20 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Nov 29 12:46:51 2021 +0000 Add snowflake event handler to client config --- client/lib/snowflake.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 56dd312..fdcb457 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -35,6 +35,7 @@ import ( "strings" "time" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/nat" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/turbotunnel" "github.com/pion/webrtc/v3" @@ -92,6 +93,9 @@ type ClientConfig struct { // Max is the maximum number of snowflake proxy peers that the client should attempt to // connect to. Defaults to 1. Max int + // EventDispatcher is the event bus for snowflake events. + // When an important event happens, it will be distributed here. + EventDispatcher event.SnowflakeEventDispatcher } // NewSnowflakeClient creates a new Snowflake transport client that can spawn multiple

1 0

[snowflake/main] Add NewWebRTCPeer3E Initializer
by shelikhoo＠torproject.org 25 Jan '22

25 Jan '22

commit 36ca610d6bf399a1cf6e6d35cec8e57e6eddf6b4 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 13 15:05:38 2021 +0000 Add NewWebRTCPeer3E Initializer This name includes [E]vent to reduce merge conflict with forward proxy change set. --- client/lib/webrtc.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 4068eb8..01b85f5 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -36,13 +36,22 @@ type WebRTCPeer struct { eventsLogger event.SnowflakeEventReceiver } -// NewWebRTCPeer constructs a WebRTC PeerConnection to a snowflake proxy. +func NewWebRTCPeer(config *webrtc.Configuration, + broker *BrokerChannel) (*WebRTCPeer, error) { + return NewWebRTCPeer3E(config, broker, nil) +} + +// NewWebRTCPeer3E constructs a WebRTC PeerConnection to a snowflake proxy. // // The creation of the peer handles the signaling to the Snowflake broker, including // the exchange of SDP information, the creation of a PeerConnection, and the establishment // of a DataChannel to the Snowflake proxy. -func NewWebRTCPeer(config *webrtc.Configuration, - broker *BrokerChannel) (*WebRTCPeer, error) { +func NewWebRTCPeer3E(config *webrtc.Configuration, + broker *BrokerChannel, eventsLogger event.SnowflakeEventReceiver) (*WebRTCPeer, error) { + if eventsLogger == nil { + eventsLogger = event.NewSnowflakeEventDispatcher() + } + connection := new(WebRTCPeer) { var buf [8]byte @@ -59,6 +68,8 @@ func NewWebRTCPeer(config *webrtc.Configuration, // Pipes remain the same even when DataChannel gets switched. connection.recvPipe, connection.writePipe = io.Pipe() + connection.eventsLogger = eventsLogger + err := connection.connect(config, broker) if err != nil { connection.Close()

1 0