December 2014 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Add label to indicate that all traffic goes over Tor (#13757)
by sukhbir＠torproject.org 07 Dec '14

07 Dec '14

commit 5219178857f79e73ee960ae8797e0bc0896e7d43 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Dec 7 15:56:18 2014 +0530 Add label to indicate that all traffic goes over Tor (#13757) --- projects/instantbird/config | 1 + projects/instantbird/trafficinfo.patch | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index d69d5cc..2a479cb 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -67,6 +67,7 @@ input_files: - filename: accountcreation.patch - filename: links.patch - filename: picture.patch + - filename: trafficinfo.patch - filename: fix-mingw-build.nsprpatch enable: '[% c("var/windows") %]' - filename: fix-mingw-build.patch diff --git a/projects/instantbird/trafficinfo.patch b/projects/instantbird/trafficinfo.patch new file mode 100644 index 0000000..c571b79 --- /dev/null +++ b/projects/instantbird/trafficinfo.patch @@ -0,0 +1,25 @@ +diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul +index 5fa5b82..46447ff 100644 +--- a/im/content/accountWizard.xul ++++ b/im/content/accountWizard.xul +@@ -39,6 +39,8 @@ + <description class="top-proto-description" value="&accountProtocolShowMore.description;"/> + </richlistitem> + </richlistbox> ++ <separator class="thin"/> ++ <description>&accountProtocolInfo.label3;</description> + </wizardpage> + + <wizardpage id="accountprotocol" pageid="accountprotocol" next="accountusername" +diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd +index 43d0f19..5492985 100644 +--- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd ++++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd +@@ -6,6 +6,7 @@ + + <!ENTITY accountProtocolTitle.label "Protocol"> + <!ENTITY accountProtocolInfo.label2 "Please choose the protocol of your IM account."> ++<!ENTITY accountProtocolInfo.label3 "All traffic will be routed over the Tor network."> + <!ENTITY accountProtocolGetMore.label "Get more…"> + <!ENTITY accountProtocolShowMore.label "Show all protocols"> + <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Dec '14

07 Dec '14

commit 36183ebfa63b084fcf1c73101ed94dcfdfd51d55 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 7 07:45:03 2014 +0000 Update translations for bridgedb --- gl/LC_MESSAGES/bridgedb.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gl/LC_MESSAGES/bridgedb.po b/gl/LC_MESSAGES/bridgedb.po index 8601024..5a21603 100644 --- a/gl/LC_MESSAGES/bridgedb.po +++ b/gl/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Luz Varela Armas <luz.armas(a)udc.es>, 2014 # manuel meixide <m.meixide(a)gmail.com>, 2013 # Miguel Anxo Bouzada <mbouzada(a)gmail.com>, 2013 # pepepenha <pepepenha(a)hotmail.com>, 2014 @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-07-26 09:42+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-12-07 07:20+0000\n" +"Last-Translator: Luz Varela Armas <luz.armas(a)udc.es>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +60,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "Dámoslle a benvida a BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 @@ -69,15 +70,15 @@ msgstr "" #: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "Ola, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "" +msgstr "Ola amigo/a!" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" -msgstr "" +msgstr "Claves públicas" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 07 Dec '14

07 Dec '14

commit 3c7b1cee052246e9990b0ca90ccd19bf0bf54945 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 7 05:15:20 2014 +0000 Update translations for liveusb-creator_completed --- zh_TW/zh_TW.po | 62 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index b4acc40..a5884c5 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -4,9 +4,10 @@ # # Translators: # cges30901 <cges30901(a)gmail.com>, 2014 -# chinrur <chinrur(a)gmail.com>, 2013 +# Chinrur Yang <chinrur(a)gmail.com>, 2013 # danfong <danfong.hsieh(a)gmail.com>, 2014 # muraji saori <muraji(a)tormail.org>, 2013 +# Nicholas Ou <oldmonou(a)gmail.com>, 2014 # Terry Chuang <tchuang(a)redhat.com>, 2009 # Wei-Lun Chao <william.chao(a)ossii.com.tw>, 2009 # x4r <xatierlike(a)gmail.com>, 2014 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-01 22:11+0200\n" -"PO-Revision-Date: 2014-07-02 08:56+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-12-01 18:01+0100\n" +"PO-Revision-Date: 2014-12-07 05:00+0000\n" +"Last-Translator: Nicholas Ou <oldmonou(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +46,7 @@ msgstr "%(size)s %(label)s" msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1047 +#: ../liveusb/creator.py:1059 #, python-format msgid "%s already bootable" msgstr "%s 已經可開機" @@ -102,12 +103,12 @@ msgid "" "persist after a reboot." msgstr "藉由在您的 USB 隨身碟配置額外空間給永久覆蓋，您將能夠在即時作業系統中存放資料和作永久修改。否則，您將無法在重新開機後儲存資料。" -#: ../liveusb/creator.py:1146 ../liveusb/creator.py:1409 +#: ../liveusb/creator.py:1158 ../liveusb/creator.py:1421 #, python-format msgid "Calculating the SHA1 of %s" msgstr "計算 %s 的 SHA1" -#: ../liveusb/creator.py:1357 +#: ../liveusb/creator.py:1369 msgid "Cannot find" msgstr "找不到" @@ -158,7 +159,7 @@ msgstr "下載失敗：" msgid "Downloading %s..." msgstr "正在下載 %s..." -#: ../liveusb/creator.py:1142 +#: ../liveusb/creator.py:1154 msgid "Drive is a loopback, skipping MBR reset" msgstr "磁碟回送，略過 MBR 重設" @@ -167,7 +168,7 @@ msgstr "磁碟回送，略過 MBR 重設" msgid "Entering unmount_device for '%(device)s'" msgstr "進入未掛接裝置 '%(device)s'" -#: ../liveusb/creator.py:1222 +#: ../liveusb/creator.py:1234 msgid "Error probing device" msgstr "探測裝置失敗" @@ -187,7 +188,7 @@ msgstr "錯誤：您 Live CD 的 SHA1 無效。您可以使用 --noverify 引數 msgid "Extracting live image to the target device..." msgstr "正在解壓縮即時映像檔到目標設備上..." -#: ../liveusb/creator.py:1090 +#: ../liveusb/creator.py:1102 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "將 %(device)s 格式化成 FAT32 格式" @@ -223,7 +224,7 @@ msgstr "安裝完成! (%s)" msgid "Installation was completed. Press OK to close this program." msgstr "安裝已完成，按下「確定」關閉此程式。" -#: ../liveusb/creator.py:947 ../liveusb/creator.py:1263 +#: ../liveusb/creator.py:959 ../liveusb/creator.py:1275 msgid "Installing bootloader..." msgstr "正在安裝 bootloader..." @@ -231,13 +232,13 @@ msgstr "正在安裝 bootloader..." msgid "LiveUSB creation failed!" msgstr "LiveUSB 建立失敗！" -#: ../liveusb/creator.py:1358 +#: ../liveusb/creator.py:1370 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "執行此程式前請先解壓縮整個 libusb-creator zip 檔案。" -#: ../liveusb/creator.py:1234 +#: ../liveusb/creator.py:1246 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "請確認您的 USB 磁碟已插入，並使用 FAT 檔案系統進行格式化" @@ -257,8 +258,11 @@ msgid "No mount points found" msgstr "找不到掛接點" #: ../liveusb/creator.py:401 -msgid "Not enough free space on device." -msgstr "裝置上的可用空間不足。" +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "裝置上的可用空間不足。\n%dMB ISO + %dMB覆蓋 > %dMB可用空間" #: ../liveusb/gui.py:538 msgid "Partition is FAT16; Restricting overlay size to 2G" @@ -293,7 +297,7 @@ msgstr "正在重新整理版本..." msgid "Releases updated!" msgstr "版本已更新!" -#: ../liveusb/creator.py:954 ../liveusb/creator.py:1281 +#: ../liveusb/creator.py:966 ../liveusb/creator.py:1293 #, python-format msgid "Removing %(file)s" msgstr "移除 %(file)s" @@ -302,7 +306,7 @@ msgstr "移除 %(file)s" msgid "Removing existing Live OS" msgstr "移除現有的 Live OS" -#: ../liveusb/creator.py:1136 +#: ../liveusb/creator.py:1148 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "重設 %s 的 MBR 主開機紀錄" @@ -327,7 +331,7 @@ msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "來源類型不支援 ISO MD5 總和檢查碼的驗證，略過" -#: ../liveusb/creator.py:1170 +#: ../liveusb/creator.py:1182 msgid "Synchronizing data on disk..." msgstr "正在同步磁碟上的資料..." @@ -379,11 +383,11 @@ msgstr "這個進度列將會表示 LiveUSB 建立過程還需要多久" msgid "This is the status console, where all messages get written to." msgstr "這是狀態主控台，所有訊息都會寫入到這裡。" -#: ../liveusb/creator.py:910 +#: ../liveusb/creator.py:922 msgid "Trying to continue anyway." msgstr "無論如何仍嘗試繼續。" -#: ../liveusb/creator.py:942 +#: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "無法變更磁碟區標籤: %(message)s" @@ -402,15 +406,15 @@ msgstr "無法複製 %(infile)s 到 %(outfile)s: %(message)s" msgid "Unable to find any USB drive" msgstr "找不到任何的 USB 裝置" -#: ../liveusb/creator.py:1224 +#: ../liveusb/creator.py:1236 msgid "Unable to find any supported device" msgstr "找不到任何有支援的裝置" -#: ../liveusb/creator.py:1067 +#: ../liveusb/creator.py:1079 msgid "Unable to find partition" msgstr "找不到分割區" -#: ../liveusb/creator.py:1304 +#: ../liveusb/creator.py:1316 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "無法取得 Win32_LogicalDisk; win32com 查詢沒有傳回任何結果" @@ -434,7 +438,7 @@ msgstr "無法從先前的 LiveOS 移除目錄: %(message)s" msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "無法從先前的 LiveOS 移除檔案: %(message)s" -#: ../liveusb/creator.py:1139 +#: ../liveusb/creator.py:1151 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "無法重設 MBR。您可能沒有安裝 `syslinux` 套件。" @@ -459,7 +463,7 @@ msgstr "未知的 ISO，略過總和檢查碼驗證" msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "掛接裝置時發生未知的 dbus 例外: %(message)s" -#: ../liveusb/creator.py:779 ../liveusb/creator.py:921 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:933 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "未知的檔案系統。您的裝置可能需要重新格式化。" @@ -478,12 +482,12 @@ msgstr "正在卸載 '%(udi)s' 在 '%(device)s'" msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "正在卸載掛接在 '%(device)s' 上的檔案系統" -#: ../liveusb/creator.py:907 +#: ../liveusb/creator.py:919 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "不支援的裝置 '%(device)s'，請報告錯誤。" -#: ../liveusb/creator.py:784 ../liveusb/creator.py:924 +#: ../liveusb/creator.py:784 ../liveusb/creator.py:936 #, python-format msgid "Unsupported filesystem: %s" msgstr "不支援的檔案系統：%s" @@ -495,7 +499,7 @@ msgid "" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "不支援的檔案系統: %s\n如果您要升級手動安裝的 Tails 系統 (也就是說，它不是用這個安裝程式來安裝)，不支援此選項：你必須重新安裝然後開始，例如:選擇「複製並安裝」動作代替。" -#: ../liveusb/creator.py:1237 +#: ../liveusb/creator.py:1249 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -527,7 +531,7 @@ msgstr "驗證 LiveCD 映像檔的 SHA1 總和檢查碼..." msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "驗證 LiveCD 映像檔的 SHA256 總和檢查碼..." -#: ../liveusb/creator.py:918 ../liveusb/creator.py:1230 +#: ../liveusb/creator.py:930 ../liveusb/creator.py:1242 msgid "Verifying filesystem..." msgstr "正在驗證檔案系統..."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 07 Dec '14

07 Dec '14

commit 3f4e018361aa4ec5d586a51db861cd36ee865913 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 7 05:15:16 2014 +0000 Update translations for liveusb-creator --- zh_TW/zh_TW.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 1f2536a..a5884c5 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -4,9 +4,10 @@ # # Translators: # cges30901 <cges30901(a)gmail.com>, 2014 -# chinrur <chinrur(a)gmail.com>, 2013 +# Chinrur Yang <chinrur(a)gmail.com>, 2013 # danfong <danfong.hsieh(a)gmail.com>, 2014 # muraji saori <muraji(a)tormail.org>, 2013 +# Nicholas Ou <oldmonou(a)gmail.com>, 2014 # Terry Chuang <tchuang(a)redhat.com>, 2009 # Wei-Lun Chao <william.chao(a)ossii.com.tw>, 2009 # x4r <xatierlike(a)gmail.com>, 2014 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-01 18:01+0100\n" -"PO-Revision-Date: 2014-12-03 08:43+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-12-07 05:00+0000\n" +"Last-Translator: Nicholas Ou <oldmonou(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -261,7 +262,7 @@ msgstr "找不到掛接點" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "裝置上的可用空間不足。\n%dMB ISO + %dMB覆蓋 > %dMB可用空間" #: ../liveusb/gui.py:538 msgid "Partition is FAT16; Restricting overlay size to 2G"

1 0

[meek/master] Remove the latencytest App Engine app.
by dcf＠torproject.org 07 Dec '14

07 Dec '14

commit 5e778fff2595ce82e3971a4ecd3eb3d2a068dd16 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 6 18:48:45 2014 -0800 Remove the latencytest App Engine app. It's served its purpose. We have meek-google settled now. Latency will matter less in the future. --- README | 4 -- latencytest/README | 3 - latencytest/app.yaml | 8 --- latencytest/latencytest.go | 157 -------------------------------------------- 4 files changed, 172 deletions(-) diff --git a/README b/README index 03424c5..5fa96e0 100644 --- a/README +++ b/README @@ -54,10 +54,6 @@ terminateprocess-buffer: An auxiliary program used on Windows to assist with cleanup of subprocesses. -latencytest: -A test program for App Engine that measures roundtrip times to different -destinations. - nginx: A reflector configuration for Nginx. diff --git a/latencytest/README b/latencytest/README deleted file mode 100644 index c96e60c..0000000 --- a/latencytest/README +++ /dev/null @@ -1,3 +0,0 @@ -This is an App Engine web app that measures the latency between the App -Engine servers and other endpoints. A copy of this app is running at -http://meek-latency-test.appspot.com/. diff --git a/latencytest/app.yaml b/latencytest/app.yaml deleted file mode 100644 index 428fcd5..0000000 --- a/latencytest/app.yaml +++ /dev/null @@ -1,8 +0,0 @@ -application: meek-latency-test -version: 1 -runtime: go -api_version: go1 - -handlers: -- url: /.* - script: _go_app diff --git a/latencytest/latencytest.go b/latencytest/latencytest.go deleted file mode 100644 index e4ef0bf..0000000 --- a/latencytest/latencytest.go +++ /dev/null @@ -1,157 +0,0 @@ -// This program tests the HTTP round-trip time from App Engine to various -// endpoints. It does several POSTS to each endpoint and then draws a graph -// showing the round-trip time. -package latencytest - -import ( - "encoding/json" - "fmt" - "html" - "net/http" - "time" - - "appengine" - "appengine/urlfetch" -) - -var urls = [...]string{ - "http://meek.bamsoftware.com:7002/", - "https://meek.bamsoftware.com:7443/", - "http://83.212.83.23:7002/", - "http://www.googleusercontent.com/", - "https://www.googleusercontent.com/", -} - -const ( - urlFetchTimeout = 10 * time.Second - numTrials = 5 -) - -var context appengine.Context - -type record struct { - Duration float64 - Status string - Err error -} - -func timeGet(u string) (rec *record) { - rec = new(record) - - transport := urlfetch.Transport{ - Context: context, - Deadline: urlFetchTimeout, - } - req, err := http.NewRequest("POST", u, nil) - if err != nil { - rec.Err = err - return rec - } - start := time.Now() - resp, err := transport.RoundTrip(req) - end := time.Now() - if err != nil { - rec.Err = err - return rec - } - defer resp.Body.Close() - - rec.Duration = end.Sub(start).Seconds() - rec.Status = resp.Status - - return rec -} - -func handler(w http.ResponseWriter, r *http.Request) { - context = appengine.NewContext(r) - - records := make(map[string][]*record) - for _, u := range urls { - records[u] = make([]*record, 0, numTrials) - } - for i := 0; i < numTrials; i++ { - for _, u := range urls { - records[u] = append(records[u], timeGet(u)) - } - } - - w.Header().Set("Content-Type", "text/html; charset=utf-8") - w.WriteHeader(http.StatusOK) - - fmt.Fprint(w, `<!DOCTYPE html> -<html> -<head> -<meta charset=utf-8> -<title>Latency test</title> -</head> -<body> - -<div id="chartContainer"> - <script src="http://d3js.org/d3.v3.min.js"></script> - <script src="http://dimplejs.org/dist/dimple.v1.1.5.min.js"></script> - <script type="text/javascript"> - var svg = dimple.newSvg("#chartContainer", 800, 400); - var data = [ -`) - for _, u := range urls { - for _, rec := range records[u] { - if rec.Err != nil { - continue - } - row := struct { - URL string - Latency float64 - }{ - URL: u, - Latency: rec.Duration * 1000, - } - rep, err := json.Marshal(row) - if err != nil { - continue - } - fmt.Fprintf(w, " %s,\n", rep) - } - } - - fmt.Fprint(w, ` ]; - var myChart = new dimple.chart(svg, data); - myChart.setBounds(230, 20, "100%,-250", "100%,-70") - myChart.addMeasureAxis("x", "Latency"); - var y = myChart.addCategoryAxis("y", "URL"); -`) - rep, err := json.Marshal(urls) - if err == nil { - fmt.Fprintf(w, " var urls = %s;\n", rep) - fmt.Fprintf(w, " urls.reverse();\n") - fmt.Fprintf(w, " y.addOrderRule(urls);\n") - } - fmt.Fprint(w, ` myChart.addSeries(["Latency", "URL"], dimple.plot.bubble); - myChart.draw(); - </script> -</div> -`) - fmt.Fprint(w, "<table>\n") - for _, u := range urls { - var sum float64 - fmt.Fprintf(w, "<tr><th colspan=3 align=center bgcolor=lightblue>%s</th></tr>\n", html.EscapeString(u)) - for i, rec := range records[u] { - var status string - if rec.Err != nil { - status = rec.Err.Error() - } else { - status = rec.Status - sum += rec.Duration - } - fmt.Fprintf(w, "<tr><td align=right>%d</td><td align=right>%s</td><td align=right>%.2f ms</td></tr>\n", - i, html.EscapeString(status), rec.Duration*1000) - } - fmt.Fprintf(w, "<tr><td align=right><b>avg</b></td><td></td><td align=right><b>%.2f ms</b></td></tr>\n", - sum/float64(len(records[u]))*1000) - } - fmt.Fprint(w, "</table>\n") - -} - -func init() { - http.HandleFunc("/", handler) -}

1 0

[meek/master] Use the "Tor Browser" name.
by dcf＠torproject.org 07 Dec '14

07 Dec '14

commit 45c67239409eb50e69d644cb333c2aa600a5ab67 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 6 18:52:18 2014 -0800 Use the "Tor Browser" name. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 5fa96e0..0d8d78d 100644 --- a/README +++ b/README @@ -46,7 +46,7 @@ chrome, firefox: Browser extensions for TLS camouflage. meek-client-torbrowser: -An auxiliary program for the Tor Browser Bundle that runs a copy of +An auxiliary program for within Tor Browser that runs a second copy of Firefox with the browser extension and then configures meek-client to use it as a helper.

1 0

[meek/master] Mention and link to #Webservices.
by dcf＠torproject.org 07 Dec '14

07 Dec '14

commit 59f41975368c96fd0f9c4cfbdab15a8ab7e6cbbb Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 6 18:58:49 2014 -0800 Mention and link to #Webservices. https://trac.torproject.org/projects/tor/ticket/13335 --- README | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README b/README index 65b3fd1..b79d761 100644 --- a/README +++ b/README @@ -19,6 +19,15 @@ appspot.com while appearing to communicate with www.google.com can run the client plugin program like this: meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com +meek can use a number of web services as a transport backend. Some of +these, like CDNs, are very easy to set up for domain fronting: you just +point the CDN at an instance of meek-server. Others, like App Engine, +require you to run a small "reflector" app on the service that forwards +requests to meek-server. A description of how to set up various services +is at https://trac.torproject.org/projects/tor/wiki/doc/meek#Webservices. +Reflector apps are found in the appengine, nginx, php, and wsgi +directories. + The meek-client program by itself has a fingerprintable TLS handshake. To disguise the TLS part of HTTPS connections, meek-client should be run with the --helper option pointing at a browser extension that has been

1 0

[meek/master] Alphabetize.
by dcf＠torproject.org 07 Dec '14

07 Dec '14

commit 4dea573d708f6836ac15155b0aa815d97b962f35 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 6 18:53:46 2014 -0800 Alphabetize. --- README | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README b/README index 0d8d78d..65b3fd1 100644 --- a/README +++ b/README @@ -30,12 +30,6 @@ Firefox are in the chrome and firefox directories. Here is a summary of the programs that appear in subdirectories. -meek-client: -The client transport plugin, run by a censored client. - -meek-server: -The server transport plugin, run on a Tor relay. - appengine: Reflector web app that runs on Google App Engine. The reflector simply copies requests and responses to an instance of meek-server somewhere. A @@ -45,14 +39,16 @@ https://meek-reflect.appspot.com/. chrome, firefox: Browser extensions for TLS camouflage. +meek-client: +The client transport plugin, run by a censored client. + meek-client-torbrowser: An auxiliary program for within Tor Browser that runs a second copy of Firefox with the browser extension and then configures meek-client to use it as a helper. -terminateprocess-buffer: -An auxiliary program used on Windows to assist with cleanup of -subprocesses. +meek-server: +The server transport plugin, run on a Tor relay. nginx: A reflector configuration for Nginx. @@ -62,6 +58,10 @@ A PHP reflector. It can be run on any platform that supports PHP with the cURL library. A public instance is at https://meek-reflect.herokuapp.com/. +terminateprocess-buffer: +An auxiliary program used on Windows to assist with cleanup of +subprocesses. + wsgi: A WSGI Python reflector.

1 0

[meek/master] Add Yawning's Nginx reflector configuration.
by dcf＠torproject.org 07 Dec '14

07 Dec '14

commit 2cce35a5624cc0d93d1c2919c74519a854608c81 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 6 18:37:43 2014 -0800 Add Yawning's Nginx reflector configuration. Copied from https://trac.torproject.org/projects/tor/wiki/doc/meek#UsingnginxinsteadofG…, which I am about to delete. --- README | 3 +++ nginx/README | 9 ++++++++ nginx/nginx.conf.example | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/README b/README index 4348942..72b8cb7 100644 --- a/README +++ b/README @@ -58,6 +58,9 @@ latencytest: A test program for App Engine that measures roundtrip times to different destinations. +nginx: +A reflector configuration for Nginx. + php: A php reflector similar to the appengine one above. Ideally, it can be run on any platform that supports php. A public instance is at: diff --git a/nginx/README b/nginx/README new file mode 100644 index 0000000..24a224d --- /dev/null +++ b/nginx/README @@ -0,0 +1,9 @@ +The file nginx.conf.example is an example configuration file for Nginx +that shows how to run multiple virtual-host domain names, with one of +them reflecting to an instance of meek-server. Clients can front behind +one of the ordinary domain names in order to reach the reflector domain. + +Here is the matching client torrc configuration: + UseBridges 1 + Bridge meek 0.0.2.0:1 url=https://meek-reflect.example.com/ front=www.example.com + ClientTransportPlugin meek exec ./meek-client --log meek-client.log diff --git a/nginx/nginx.conf.example b/nginx/nginx.conf.example new file mode 100644 index 0000000..0f0b4db --- /dev/null +++ b/nginx/nginx.conf.example @@ -0,0 +1,53 @@ +# The configuration for the normal HTTPS server +server { + # Set default_server so that real content gets served by default +# listen 443 default_server; + listen [::]:443 default_server; + server_name www.example.com; + + # Boilerplate for SSL, adjust as appropriate. + ssl on; + ssl_certificate /etc/ssl/nginx/example.com.crt; + ssl_certificate_key /etc/ssl/nginx/example.com.key; + ssl_session_timeout 5m; + ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers !RC4:HIGH:!MD5:!aNULL:!DH; + ssl_prefer_server_ciphers on; + + # Blah blah blah, normal site specific config + root /usr/share/nginx/www; + index index.html index.htm; + location / { + index index.html; + } +} + +# Configuration for the reflector +server { +# listen 443; + listen [::]:443; + + # This does not need to be a real name, but it MUST be distinct from + # the host used for real content. + server_name meek-reflect.example.com; + + # Boilerplate for SSL/TLS (copy/paste from the other server block) + ssl on; + ssl_certificate /etc/ssl/nginx/example.com.crt; + ssl_certificate_key /etc/ssl/nginx/example.com.key; + ssl_session_timeout 5m; + ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers !RC4:HIGH:!MD5:!aNULL:!DH; + ssl_prefer_server_ciphers on; + + # This is where the magic happens + location / { + # Proxy traffic all traffic received with the meek Host to + # a meek-server instance. + proxy_pass http://meek.bamsoftware.com:7002; + + # Disable logging for the reflector. + access_log off; + error_log /dev/null; + } +}

1 0

[meek/master] Reflow paragraphs, edit a bit.
by dcf＠torproject.org 07 Dec '14

07 Dec '14

commit d8227191c30f040f8dc918622d0c9573dcbc31a3 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 6 18:38:53 2014 -0800 Reflow paragraphs, edit a bit. --- README | 6 +++--- php/README | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README b/README index 72b8cb7..03424c5 100644 --- a/README +++ b/README @@ -62,9 +62,9 @@ nginx: A reflector configuration for Nginx. php: -A php reflector similar to the appengine one above. Ideally, it can be run on -any platform that supports php. A public instance is at: -https://meek-reflect.herokuapp.com/ +A PHP reflector. It can be run on any platform that supports PHP with +the cURL library. A public instance is at +https://meek-reflect.herokuapp.com/. wsgi: A WSGI Python reflector. diff --git a/php/README b/php/README index 88063de..b8e96b8 100644 --- a/php/README +++ b/php/README @@ -1,13 +1,13 @@ -Ideally, this component can run on any platform that supports PHP. It lies -between meek-client and meek-server, and receives requests from the client and -forwards them to the server, then receives responses from the server and -forwards them to the client. +Ideally, this component can run on any platform that supports PHP. It +lies between meek-client and meek-server, and receives requests from the +client and forwards them to the server, then receives responses from the +server and forwards them to the client. To test locally, run: php -S 127.0.0.1:8080 -The app will be running at http://127.0.0.1:8080/. To configure meek-client to -talk to the locally running app, put this in torrc: +The app will be running at http://127.0.0.1:8080/. To configure +meek-client to talk to the locally running app, put this in torrc: UseBridges 1 Bridge meek 0.0.2.0:1 url=http://127.0.0.1:8080/ ClientTransportPlugin meek exec ./meek-client --log meek-client.log

1 0