tbb-commits May 2019

tbb-commits@lists.torproject.org

2 participants
142 discussions

[tor-browser-build/master] Pick up latest fixes for #30489
by gk＠torproject.org 15 May '19

15 May '19

commit f8a080343fd4a21b4ffc3246c082625569269dc4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 07:30:40 2019 +0000 Pick up latest fixes for #30489 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 4708da4..a87422c 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: d5c9b1f569e1f04ccadeb75184cec0766c4c2f4d +git_hash: 28cc173eed552521a02b8edd94f4b7be8df7897f git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-launcher/maint-0.2.18] Translations update
by gk＠torproject.org 15 May '19

15 May '19

commit 169a485c106df711d2f162548c78cbf237b888a4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 06:52:24 2019 +0000 Translations update --- src/chrome/locale/ko/torlauncher.properties | 98 ++++++++++++++--------------- src/chrome/locale/ur/network-settings.dtd | 28 ++++----- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 2e32da2..7b430b3 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -3,43 +3,43 @@ torlauncher.error_title=Tor 런처 -torlauncher.tor_exited_during_startup=시작하는 동안 Tor가 종료되었습니다. 이것은 torrc 파일의 오류, Tor 또는 시스템의 다른 프로그램의 버그 또는 하드웨어 결함으로 인한 것일 수 있습니다. 기본 문제를 해결하고 Tor를 다시 시작할 때까지 Tor 브라우저는 시작되지 않습니다. +torlauncher.tor_exited_during_startup=시작하는 동안 Tor가 종료되었습니다. 이것은 torrc 파일의 오류, Tor 나 PC의 다른 프로그램의 버그, 혹은 하드웨어 결함으로 인한 것일 수 있습니다. 기본 문제를 해결하고 Tor를 다시 시작할 때까지 Tor 브라우저는 시작되지 않습니다. torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. 이것은 Tor 자체의 오류, 사용자 시스템의 타 프로그램 또는 하드웨어의 오류 때문일 수 있습니다. 사용자가 Tor를 재시작 하기 전까진, Tor 브라우저는 어떠한 웹사이트에 접속하지 않습니다. 문제가 계속된다면, 지원팀에게 당신의 Tor 로그를 보내주십시오. -torlauncher.tor_exited2=Tor를 재시작해도 브라우저 탭은 닫히지 않음. +torlauncher.tor_exited2=Tor를 재시작해도 브라우저 탭은 닫히지 않습니다. torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결할 수 없습니다. -torlauncher.tor_failed_to_start=Tor 시작 실패. +torlauncher.tor_failed_to_start=Tor 시작에 실패했습니다. torlauncher.tor_control_failed=Tor 제어에 실패했습니다. -torlauncher.tor_bootstrap_failed=Tor 네트워크 연결 설정 실패 +torlauncher.tor_bootstrap_failed=Tor 네트워크 연결에 실패했습니다. torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S) torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S torlauncher.tor_missing=Tor 실행 파일이 없습니다. torlauncher.torrc_missing=torrc 파일이 사라졌으며 생성 할 수 없습니다. torlauncher.datadir_missing=Tor 데이터 디렉토리가 존재하지 않으며 생성할 수 없습니다. -torlauncher.password_hash_missing=해쉬 암호 획득 실패 +torlauncher.password_hash_missing=해쉬 암호을 얻어오지 못 하였습니다. torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S torlauncher.failed_to_save_settings=Tor 설정을 저장할 수 없습니다.\n\n%S -torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시오. +torlauncher.ensure_tor_is_running=Tor가 실행중인지 확인하여 주십시오. -torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. +torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, IP주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오. torlauncher.error_bridges_missing=하나 이상의 bridge를 지정해야 합니다. torlauncher.error_default_bridges_type_missing=제공된 브리지의 전송 유형을 선택해야합니다. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=전송 유형 %S가 제공 한 브리지 유효한 것이 아닙니다. 설정을 조정하십시오. +torlauncher.error_bridgedb_bridges_missing=브릿지를 요청해주세요. +torlauncher.error_bridge_bad_default_type=전송 유형 %S가 제공한 브리지는 유효하지 않습니다. 설정을 조정하십시오. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(중국에서 일하기) +torlauncher.bridge_suffix.meek-azure=(중국에서 일하기) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=브릿지 요청하기 +torlauncher.request_a_new_bridge=새로운 브릿지 요청하기 +torlauncher.contacting_bridgedb=브릿지DB에 연결하고 있으니, 잠시 기다려주세요. +torlauncher.captcha_prompt=브릿지를 요청하기 위해 CAPCHA를 풀어주세요. +torlauncher.bad_captcha_solution=풀이가 맞지 않습니다. 다시 시도해주세요. +torlauncher.unable_to_get_bridge=브릿지DB로터 브릿지를 얻어오지 못 하였습니다.\n\n%S +torlauncher.no_meek=이 브라우저는 브릿지 확보에 필요한 온전한 기능을 위해 설정되어 있지 않습니다. +torlauncher.no_bridges_available=지금은 사용할 수 있는 브릿지가 없습니다. 죄송합니다. torlauncher.connect=연결 torlauncher.restart_tor=Tor 재시작 @@ -47,40 +47,40 @@ torlauncher.quit=끝내기 torlauncher.quit_win=종료 torlauncher.done=완료 -torlauncher.forAssistance=지원자 연결 %S +torlauncher.forAssistance=도움이 필요하면, %S에 연락하십시오. torlauncher.forAssistance2=도움이 필요하면 %S를 방문하십시오. -torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 됩니다. +torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기나 이메일 메시지에 붙여넣을 수 있는 상태가 됩니다. torlauncher.bootstrapStatus.starting=시작중 -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.conn_pt=브릿지에 연결하고 있습니다. +torlauncher.bootstrapStatus.conn_done_pt=브릿지에 연결되었습니다. +torlauncher.bootstrapStatus.conn_proxy=프록시에 연결하고 있습니다. +torlauncher.bootstrapStatus.conn_done_proxy=프록시에 연결되었습니다. +torlauncher.bootstrapStatus.conn=Tor 릴레이에 연결하고 있습니다. +torlauncher.bootstrapStatus.conn_done=Tor 릴레이에 연결되었습니다. +torlauncher.bootstrapStatus.handshake=Tor 릴레이와 네고하고 있습니다. +torlauncher.bootstrapStatus.handshake_done=Tor 릴레이와의 네고를 완료하였습니다. torlauncher.bootstrapStatus.onehop_create=경로와의 연결을 암호화해서 만들고 있어요 -torlauncher.bootstrapStatus.requesting_status=네트워크의 상태를 가져오는중 -torlauncher.bootstrapStatus.loading_status=네트워크의 상태를 요청중 -torlauncher.bootstrapStatus.loading_keys=권한 인증서를 로딩중 -torlauncher.bootstrapStatus.requesting_descriptors=중계서버 정보를 요청중 -torlauncher.bootstrapStatus.loading_descriptors=중계서버 정보를 로딩중 -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Tor 네트워크에 연결 성공! +torlauncher.bootstrapStatus.requesting_status=네트워크의 상태를 가져오고 있습니다. +torlauncher.bootstrapStatus.loading_status=네트워크의 상태를 불러오고 있습니다. +torlauncher.bootstrapStatus.loading_keys=인증서를 로딩하고 있습니다. +torlauncher.bootstrapStatus.requesting_descriptors=중계서버 정보를 요청하고 있습니다. +torlauncher.bootstrapStatus.loading_descriptors=중계서버 정보를 불러오고 있습니다. +torlauncher.bootstrapStatus.enough_dirinfo=릴레이 정보 불러오기에 완료하였습니다. +torlauncher.bootstrapStatus.ap_conn_pt=우회로 연결: 브릿지에 연결하고 있습니다. +torlauncher.bootstrapStatus.ap_conn_done_pt=우회로 연결: 브릿지에 연결되었습니다. +torlauncher.bootstrapStatus.ap_conn_proxy=우회로 연결: 프록시에 연결하고 있습니다. +torlauncher.bootstrapStatus.ap_conn_done_proxy=우회로 연결: 프록시에 연결되었습니다. +torlauncher.bootstrapStatus.ap_conn=우회로 연결: Tor 릴레이에 연결하고 있습니다. +torlauncher.bootstrapStatus.ap_conn_done=우회로 연결: Tor 릴레이에 연결되었습니다. +torlauncher.bootstrapStatus.ap_handshake=우회로 연결: Tor 릴레이와 네고하고 있습니다. +torlauncher.bootstrapStatus.ap_handshake_done=우회로 연결: Tor 릴레이와의 네고가 끝났습니다. +torlauncher.bootstrapStatus.circuit_create=우회로 연결: Tor 우회로가 연결되었습니다. +torlauncher.bootstrapStatus.done=Tor 네트워크에 연결되었습니다. torlauncher.bootstrapWarning.done=완료 -torlauncher.bootstrapWarning.connectrefused=연결이 거부됨 +torlauncher.bootstrapWarning.connectrefused=연결이 거부되었습니다. torlauncher.bootstrapWarning.misc=기타 torlauncher.bootstrapWarning.resourcelimit=리소스 부족 torlauncher.bootstrapWarning.identity=계정 불일치 @@ -89,6 +89,6 @@ torlauncher.bootstrapWarning.noroute=호스트로의 연결 경로가 없음 torlauncher.bootstrapWarning.ioerror=읽기 / 쓰기 오류 torlauncher.bootstrapWarning.pt_missing=플러그가 가능한 전송을 찾을 수 없습니다 -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=서버와의 연결이 끊어졌습니다. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=서버와 연결할 수 없습니다. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=프록시와 연결할 수 없습니다. diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index eeb35c3..02b715d 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -1,24 +1,24 @@ -<!ENTITY torsettings.dialog.title "طور نیٹ ورک کے سیٹنگز"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "طور نیٹ ورک کے سیٹنگز"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.dialog.title "ٹور نیٹ ورک ترتیبات"> +<!ENTITY torsettings.wizard.title.default "ٹور کے ساتھ منسلک ہوں"> +<!ENTITY torsettings.wizard.title.configure "ٹور نیٹ ورک ترتیبات"> +<!ENTITY torsettings.wizard.title.connecting "ربط قائم کیا جارہا ہے">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "ٹور براؤزر لغت"> +<!ENTITY torlauncher.localePicker.prompt "براہِ مہربانی لغت منتخب کیجئے">  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.connectPrompt "ٹور سے منسلک ہونے کے لئے "منسلک " پر کلک کریں"> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.configure "مرتب کریں"> +<!ENTITY torSettings.connect "منسلک">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "ٹور چلنے کا انتظار ۔۔۔"> +<!ENTITY torsettings.restartTor "ٹور دوبارہ چلائیں"> +<!ENTITY torsettings.reconfigTor "دوبارہ مرتب کریں"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> <!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> @@ -31,8 +31,8 @@ <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "صارف کا نام"> -<!ENTITY torsettings.useProxy.password "پاس ورڈ "> +<!ENTITY torsettings.useProxy.username "صارف کا نام:"> +<!ENTITY torsettings.useProxy.password "پاس ورڈ :"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">

1 0

[tor-launcher/maint-0.2.18] Release preparation for 0.2.18.3
by gk＠torproject.org 15 May '19

15 May '19

commit 143d8e45a1d9ac46a477001e18d4bfb438a72203 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 06:52:58 2019 +0000 Release preparation for 0.2.18.3 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 060b032..a6aa4a7 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.18.2</em:version> + <em:version>0.2.18.3</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 29982 - Force single-pane UI on Tor Preferences
by gk＠torproject.org 15 May '19

15 May '19

commit 6a6052976627429027602a3b6871f0ae37aaa36d Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 14 19:57:56 2019 +0000 Bug 29982 - Force single-pane UI on Tor Preferences --- .../android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index 87b752ab5991..2519fed4a8b1 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -131,6 +131,7 @@ public class TorPreferences extends AppCompatPreferenceActivity { protected void onCreate(Bundle savedInstanceState) { // Begin with the first (Enable Bridges) fragment getIntent().putExtra(EXTRA_SHOW_FRAGMENT, sTorNetworkBridgesEnabledPreferenceName); + getIntent().putExtra(EXTRA_NO_HEADERS, true); super.onCreate(savedInstanceState); mFrag = null;

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 29982 - Force single-pane UI on Tor Preferences
by gk＠torproject.org 15 May '19

15 May '19

commit b914bb89ff0d07765c29a11ead947315f1e6d054 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 14 19:57:56 2019 +0000 Bug 29982 - Force single-pane UI on Tor Preferences --- .../android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index 87b752ab5991..2519fed4a8b1 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -131,6 +131,7 @@ public class TorPreferences extends AppCompatPreferenceActivity { protected void onCreate(Bundle savedInstanceState) { // Begin with the first (Enable Bridges) fragment getIntent().putExtra(EXTRA_SHOW_FRAGMENT, sTorNetworkBridgesEnabledPreferenceName); + getIntent().putExtra(EXTRA_NO_HEADERS, true); super.onCreate(savedInstanceState); mFrag = null;

1 0

[torbutton/master] Translations update
by gk＠torproject.org 15 May '19

15 May '19

commit 999e5a388d4710330b2637618c76be8fb663b128 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 06:01:25 2019 +0000 Translations update --- src/chrome/locale/ar/aboutTor.dtd | 2 ++ src/chrome/locale/bn-BD/aboutTor.dtd | 2 ++ src/chrome/locale/ca/aboutTor.dtd | 2 ++ src/chrome/locale/cs/aboutTor.dtd | 2 ++ src/chrome/locale/da/aboutTor.dtd | 2 ++ src/chrome/locale/de/aboutTor.dtd | 2 ++ src/chrome/locale/el/aboutTor.dtd | 2 ++ src/chrome/locale/es-AR/aboutTor.dtd | 2 ++ src/chrome/locale/es-ES/aboutTor.dtd | 2 ++ src/chrome/locale/eu/aboutTor.dtd | 2 ++ src/chrome/locale/fa/aboutTor.dtd | 2 ++ src/chrome/locale/fr/aboutTor.dtd | 2 ++ src/chrome/locale/ga-IE/aboutTor.dtd | 2 ++ src/chrome/locale/he/aboutTor.dtd | 2 ++ src/chrome/locale/hu/aboutTor.dtd | 2 ++ src/chrome/locale/id/aboutTor.dtd | 2 ++ src/chrome/locale/is/aboutTor.dtd | 2 ++ src/chrome/locale/it/aboutTor.dtd | 2 ++ src/chrome/locale/ja/aboutTor.dtd | 2 ++ src/chrome/locale/ka/aboutTor.dtd | 2 ++ src/chrome/locale/ko/aboutTor.dtd | 2 ++ src/chrome/locale/nb-NO/aboutTor.dtd | 2 ++ src/chrome/locale/nl/aboutTor.dtd | 2 ++ src/chrome/locale/pl/aboutTor.dtd | 2 ++ src/chrome/locale/pt-BR/aboutTor.dtd | 2 ++ src/chrome/locale/ru/aboutTor.dtd | 2 ++ src/chrome/locale/sv-SE/aboutTor.dtd | 2 ++ src/chrome/locale/tr/aboutTor.dtd | 2 ++ src/chrome/locale/vi/aboutTor.dtd | 2 ++ src/chrome/locale/zh-CN/aboutTor.dtd | 2 ++ src/chrome/locale/zh-TW/aboutTor.dtd | 2 ++ 31 files changed, 62 insertions(+) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 16702c40..6f8460d3 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "احصل على آخر أخبار تور مباشرة على بريدك"> <!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> +<!ENTITY aboutTor.donationBanner.line2e "حافظ على قوة تور."> +<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd index 7d40f0d0..76bc83da 100644 --- a/src/chrome/locale/bn-BD/aboutTor.dtd +++ b/src/chrome/locale/bn-BD/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "টর থেকে পাওয়া সর্বশেষ সব খবর সরাসরি আপনার ইনবক্সে দেখুন।"> <!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।"> +<!ENTITY aboutTor.donationBanner.line2e "টরকে শক্তিশালী রাখুন। "> +<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! "> diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd index 1de2ee85..fd501f7b 100644 --- a/src/chrome/locale/ca/aboutTor.dtd +++ b/src/chrome/locale/ca/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Obteniu les darreres novetats de Tor directament a la safata d'entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Fes que Tor segueixi fort."> +<!ENTITY aboutTor.donationBanner.buttonA "Fes una donació"> diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 860aa13c..06e411e5 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Nechte si posílat nejnovější informace o Toru."> <!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru."> +<!ENTITY aboutTor.donationBanner.line2e "Pomozte Toru sílit."> +<!ENTITY aboutTor.donationBanner.buttonA "Přispějte"> diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd index 499fa13a..6fba4caf 100644 --- a/src/chrome/locale/da/aboutTor.dtd +++ b/src/chrome/locale/da/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Få de seneste nyheder fra Tor direkte i din indbakke."> <!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder."> +<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk."> +<!ENTITY aboutTor.donationBanner.buttonA "Donér nu"> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index dcb397ef..1263d928 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor direkt in den Posteingang."> <!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren."> +<!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark."> +<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt"> diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index b5f39d50..1d23b6bb 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενα σας."> <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Διατηρήστε το Tor ισχυρό."> +<!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!"> diff --git a/src/chrome/locale/es-AR/aboutTor.dtd b/src/chrome/locale/es-AR/aboutTor.dtd index ec4cb73f..552db139 100644 --- a/src/chrome/locale/es-AR/aboutTor.dtd +++ b/src/chrome/locale/es-AR/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Recibí las últimas noticias de Tor derecho en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Mantener fuerte a Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Doná ahora"> diff --git a/src/chrome/locale/es-ES/aboutTor.dtd b/src/chrome/locale/es-ES/aboutTor.dtd index 1b1fb3df..aff6157d 100644 --- a/src/chrome/locale/es-ES/aboutTor.dtd +++ b/src/chrome/locale/es-ES/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Recibe las últimas noticias de Tor directamente en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora."> diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 9ee3eb08..e73e755a 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Harpidetu Tor berrietara"> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Egin dohaintza orain"> diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index 5cc12782..c097eb75 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "آخرین اخبار تور را در صندوق ورودی خود دریافت کنید."> <!ENTITY aboutTor.newsletter.link_text "ثبت‌نام برای اخبار تور."> +<!ENTITY aboutTor.donationBanner.line2e "تور را محکم نگه دارید."> +<!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index ded5c16f..04cc2a61 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> +<!ENTITY aboutTor.donationBanner.line2e "Assurez la robustesse de Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> diff --git a/src/chrome/locale/ga-IE/aboutTor.dtd b/src/chrome/locale/ga-IE/aboutTor.dtd index 8522b5cb..7f2f5d82 100644 --- a/src/chrome/locale/ga-IE/aboutTor.dtd +++ b/src/chrome/locale/ga-IE/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Faigh an nuacht is déanaí maidir le Tor i do bhosca isteach."> <!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd index 471d2b8d..5f1efea6 100644 --- a/src/chrome/locale/he/aboutTor.dtd +++ b/src/chrome/locale/he/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "קבל את החדשות האחרונות מאת Tor ישירות לתיבה הנכנסת שלך."> <!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor."> +<!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק."> +<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו"> diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd index 3b8522de..a2b39bd1 100644 --- a/src/chrome/locale/hu/aboutTor.dtd +++ b/src/chrome/locale/hu/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Kapja meg a legfrissebb Tor híreket közvetlenül email fiókjába."> <!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez."> +<!ENTITY aboutTor.donationBanner.line2e "Tartsuk a Tor-t erősnek."> +<!ENTITY aboutTor.donationBanner.buttonA "Támogasson most"> diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd index 1c265201..8e7691f7 100644 --- a/src/chrome/locale/id/aboutTor.dtd +++ b/src/chrome/locale/id/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Dapatkan berita Tor terbaru langsung ke inbox Anda."> <!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd index e54ee49b..2ee6f8d7 100644 --- a/src/chrome/locale/is/aboutTor.dtd +++ b/src/chrome/locale/is/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Fáðu nýjustu fréttir af Tor beint í pósthólfið þitt."> <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> +<!ENTITY aboutTor.donationBanner.line2e "Höldum Tor sterku"> +<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna"> diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index fb65f139..cc32558b 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Ottieni le ultime info da Tor direttamente nella tua casella di posta elettronica."> <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte."> +<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 2ba4a9f7..339848eb 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Torからの最新ニュースを受信トレイに。"> <!ENTITY aboutTor.newsletter.link_text "Torニュースにを申し込む。"> +<!ENTITY aboutTor.donationBanner.line2e "Tor を強く保つ。"> +<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index bdf92b30..144ae7e5 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "მიიღეთ სიახლეები Tor-ისგან, პირდაპირ თქვენს საფოსტო ყუთში."> <!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები."> +<!ENTITY aboutTor.donationBanner.line2e "შეინარჩუნეთ Tor ძლიერი."> +<!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა"> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 0ae8263e..0e6b1748 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "최신의 Tor 뉴스를 받은 편지함에 곧장 받으십시오."> <!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> diff --git a/src/chrome/locale/nb-NO/aboutTor.dtd b/src/chrome/locale/nb-NO/aboutTor.dtd index 8fb5ba56..1b77d88d 100644 --- a/src/chrome/locale/nb-NO/aboutTor.dtd +++ b/src/chrome/locale/nb-NO/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Få de siste nyhetene fra Tor rett til innboksen din."> <!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index db4f75ce..dc688d98 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Ontvang het laatste nieuws van Tor direct in uw postvak."> <!ENTITY aboutTor.newsletter.link_text "Meld u aan voor Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Houdt Tor sterk."> +<!ENTITY aboutTor.donationBanner.buttonA "Geef Nu"> diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index dbade396..b2d905f9 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Otrzymuj najnowsze newsy o Tor, prosto do swojej skrzynki."> <!ENTITY aboutTor.newsletter.link_text "Zapisz się na Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Utrzymuj Tor silnym."> +<!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz"> diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 5199560f..62792d16 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -29,3 +29,5 @@ <!ENTITY aboutTor.newsletter.tagline "Receba as últimas notícias do Tor diretamente na sua caixa de e-mail."> <!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Manter a força do Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 981cc3b6..fddd66c7 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Получайте последние новости Tor прямо на ваш почтовый ящик."> <!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным."> +<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> diff --git a/src/chrome/locale/sv-SE/aboutTor.dtd b/src/chrome/locale/sv-SE/aboutTor.dtd index 68aa9bc5..d403bb76 100644 --- a/src/chrome/locale/sv-SE/aboutTor.dtd +++ b/src/chrome/locale/sv-SE/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Få de senaste nyheterna från Tor direkt till din inkorg."> <!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter."> +<!ENTITY aboutTor.donationBanner.line2e "Håll Tor stark."> +<!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 9e540252..e11d658c 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Tor ile ilgili son gelişmeler doğrudan e-posta kutunuza gelsin."> <!ENTITY aboutTor.newsletter.link_text "Tor Haber Bültenine Abone Olun"> +<!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasının gücünü koruyalım."> +<!ENTITY aboutTor.donationBanner.buttonA "Bağış Yapın"> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 179102fb..c43ce61d 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mới nhất từ Tor được gửi tới hộp thư của bạn."> <!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ."> +<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ"> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 8c879049..33ea8eb4 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "注册 Tor 新闻列表"> +<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。"> +<!ENTITY aboutTor.donationBanner.buttonA "现在就捐助"> diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index 40cd6453..964a87e9 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> <!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">

1 0

[torbutton/master] Release preparations for 2.1.8
by gk＠torproject.org 15 May '19

15 May '19

commit 0e3106d27be9bedea991b26a0e767bea315efa82 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 06:06:06 2019 +0000 Release preparations for 2.1.8 Version bump and CHANGELOG update --- src/CHANGELOG | 8 ++++++++ src/install.rdf | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 858e8f53..772975ec 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,11 @@ +2.1.8 + * Bug 30171: Don't sync cookie.cookieBehavior and firstparty.isolate + * Bug 30115: Map browser+domain to credentials to fix circuit display + * Bug 30497: Add Donate link to about:tor + * Bug 30069: Use slider and about:tor localizations on mobile + * Bug 30425: Revert armagadd-on-2.0 changes + * Translations update + 2.1.7 * Bug 30388: Make sure the updated intermediate certificate keeps working diff --git a/src/install.rdf b/src/install.rdf index 637483c3..a4c0808d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.1.6</em:version> + <em:version>2.1.8</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-launcher/master] Merge branch 'bug_30319_v2'
by gk＠torproject.org 14 May '19

14 May '19

commit 125c745b8d6dfd04251e7ad2e610aeb539e49fd3 Merge: 864170b cce75d8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 14 14:16:05 2019 +0000 Merge branch 'bug_30319_v2' src/modules/tl-bridgedb.jsm | 1 - 1 file changed, 1 deletion(-)

1 0

[tor-launcher/master] Bug 30139: Remove FTE bits
by gk＠torproject.org 14 May '19

14 May '19

commit cce75d8cbe1456b050097ff5a05205c986030a5f Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 10 11:04:23 2019 +0000 Bug 30139: Remove FTE bits --- src/modules/tl-bridgedb.jsm | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index bc9b300..de580bc 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -122,7 +122,6 @@ _MoatRequestor.prototype = // // aTransports is an array of transport strings. Supported values: // "vanilla" - // "fte" // "obfs3" // "obfs4" // "scramblesuit"

1 0

[tor-browser-build/master] Bug 30319: Drop FTE releated bits
by boklm＠torproject.org 14 May '19

14 May '19

commit 055266551e5a8e56ca4ea9ec1c3eebe0fb1bba4e Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 14 13:51:25 2019 +0000 Bug 30319: Drop FTE releated bits Clean up our LICENSE file as well. --- keyring/obfsproxy.gpg | Bin 2215 -> 0 bytes keyring/pyptlib.gpg | Bin 2215 -> 0 bytes keyring/winpython.gpg | Bin 1167 -> 0 bytes projects/argparse/build | 15 -- projects/argparse/config | 19 -- projects/fteproxy/build | 19 -- projects/fteproxy/config | 24 -- projects/fteproxy/fteproxy.wrapper | 10 - projects/gmp/build | 18 -- projects/gmp/config | 20 -- projects/libfte/build | 31 --- projects/libfte/config | 43 ---- projects/obfsproxy/build | 27 -- projects/obfsproxy/config | 38 --- projects/parsley/build | 16 -- projects/parsley/config | 19 -- projects/pycrypto/build | 25 -- projects/pycrypto/config | 38 --- projects/pyptlib/build | 16 -- projects/pyptlib/config | 21 -- projects/pyyaml/build | 16 -- projects/pyyaml/config | 19 -- .../Docs/Licenses/PluggableTransports/LICENSE | 278 --------------------- .../PTConfigs/linux/torrc-defaults-appendix | 3 - projects/tor-browser/build | 20 +- projects/tor-browser/config | 3 - projects/twisted/build | 22 -- projects/twisted/config | 39 --- projects/txsocksx/build | 21 -- projects/txsocksx/config | 19 -- projects/zope.interface/build | 16 -- projects/zope.interface/config | 19 -- rbm.conf | 3 - 33 files changed, 5 insertions(+), 872 deletions(-) diff --git a/keyring/obfsproxy.gpg b/keyring/obfsproxy.gpg deleted file mode 100644 index 4381baa..0000000 Binary files a/keyring/obfsproxy.gpg and /dev/null differ diff --git a/keyring/pyptlib.gpg b/keyring/pyptlib.gpg deleted file mode 100644 index 4381baa..0000000 Binary files a/keyring/pyptlib.gpg and /dev/null differ diff --git a/keyring/winpython.gpg b/keyring/winpython.gpg deleted file mode 100644 index 97abdc1..0000000 Binary files a/keyring/winpython.gpg and /dev/null differ diff --git a/projects/argparse/build b/projects/argparse/build deleted file mode 100644 index 3170601..0000000 --- a/projects/argparse/build +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -python2 setup.py build --build-lib build -cp -a build/argparse.py $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/argparse/config b/projects/argparse/config deleted file mode 100644 index 87f80b0..0000000 --- a/projects/argparse/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 1.2.1 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - URL: 'https://pypi.python.org/packages/source/a/argparse/argparse-[% c("version") %].tar.gz' - sha256sum: ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/projects/fteproxy/build b/projects/fteproxy/build deleted file mode 100644 index ea37d05..0000000 --- a/projects/fteproxy/build +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR $DOCSDIR -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/libfte') %] -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -cp -a $rootdir/fteproxy.wrapper $PTDIR/fteproxy.wrapper -chmod +x $PTDIR/fteproxy.wrapper -cp -a bin/fteproxy $PTDIR/fteproxy.bin -cp -ra fteproxy $PTDIR/ -cp -a {COPYING,README.md} $DOCSDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/fteproxy/config b/projects/fteproxy/config deleted file mode 100644 index 9f797c5..0000000 --- a/projects/fteproxy/config +++ /dev/null @@ -1,24 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/kpdyer/fteproxy.git -# tag 0.2.19 -git_hash: 597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - project: libfte - name: libfte - - filename: fteproxy.wrapper - enable: '[% c("var/linux") %]' diff --git a/projects/fteproxy/fteproxy.wrapper b/projects/fteproxy/fteproxy.wrapper deleted file mode 100644 index ca10086..0000000 --- a/projects/fteproxy/fteproxy.wrapper +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -basedir=$(dirname "$0") -libdir=$(cd "$basedir"/fteproxy-lib ; pwd) -if test -z "$LD_LIBRARY_PATH" -then - export LD_LIBRARY_PATH="$libdir" -else - export LD_LIBRARY_PATH="$libdir:$LD_LIBRARY_PATH" -fi -exec "$basedir/fteproxy.bin" "$@" diff --git a/projects/gmp/build b/projects/gmp/build deleted file mode 100644 index 2752afe..0000000 --- a/projects/gmp/build +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.bz2 -cd /var/tmp/build/[% project %]-[% c('version') %] -# Even if we are not shipping libgmpxx anymore we still need --enable-xcc -# during compile time. -./configure --disable-static --enable-shared --enable-cxx \ - [% c("var/configure_opt") %] [% c("var/configure_opt_gmp") %] --prefix=$distdir -make -j[% c("buildconf/num_procs") %] -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/gmp/config b/projects/gmp/config deleted file mode 100644 index 41eb630..0000000 --- a/projects/gmp/config +++ /dev/null @@ -1,20 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 5.1.3 - -var: - container: - use_container: 1 - -targets: - linux: - var: - configure_opt_gmp: --enable-fat - -input_files: - - project: container-image - - name: gmp - URL: 'https://ftp.gnu.org/gnu/gmp/gmp-[% c("version") %].tar.bz2' - sha256sum: 752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' diff --git a/projects/libfte/build b/projects/libfte/build deleted file mode 100644 index 638df7a..0000000 --- a/projects/libfte/build +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% c("var/setarch") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR $DOCSDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gmp') %] -ln -s /var/tmp/dist/gmp thirdparty/gmp -mkdir -p $distdir -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] -[% IF c("var/linux-i686") -%] - export CFLAGS=-m32 - export CXXFLAGS=-m32 - export LDFLAGS=-m32 -[% END -%] -export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] -make -cp -ra fte $PTDIR/ -mkdir -p $PTDIR/fteproxy-lib -cp /var/tmp/dist/gmp/lib/libgmp.so.10 $PTDIR/fteproxy-lib -cp -a {LICENSE,README.md} $DOCSDIR/ -cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2 -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/libfte/config b/projects/libfte/config deleted file mode 100644 index 365ad81..0000000 --- a/projects/libfte/config +++ /dev/null @@ -1,43 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/kpdyer/libfte.git -git_hash: 85ef8ae58dbf0d02ea26b627e343784b5574c428 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux-x86_64: - var: - arch_deps: - - python-setuptools - - python-dev - - linux-i686: - var: - pre_pkginst: | - dpkg --add-architecture i386 - # python2.7:i386 cannot be installed because the mime-support package - # in wheezy is not marked "Multi-Arch: foreign": - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 - # We fix this by installing the jessie mime-support package. - wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… - echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c - dpkg -i mime-support_3.58_all.deb - post_pkginst: | - export DEBIAN_FRONTEND=noninteractive - apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 - apt-get install -q -y hardening-wrapper - apt-get download -q -y python-setuptools python-pkg-resources - dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb - -input_files: - - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - project: gmp - name: gmp - - project: obfsproxy - name: obfsproxy diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build deleted file mode 100644 index 46f9b7a..0000000 --- a/projects/obfsproxy/build +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR $DOCSDIR -mkdir -p $distdir -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pycrypto') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/twisted') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/argparse') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/parsley') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pyptlib') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pyyaml') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/txsocksx') %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/zope.interface') %] -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/obfsproxy $PTDIR/ -cp -a bin/obfsproxy $PTDIR/obfsproxy.bin -cp -a {LICENSE,README} $DOCSDIR -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config deleted file mode 100644 index 9616eed..0000000 --- a/projects/obfsproxy/config +++ /dev/null @@ -1,38 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 0.2.12 -git_url: https://git.torproject.org/pluggable-transports/obfsproxy.git -git_hash: 'obfsproxy-[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: obfsproxy.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - DOCSDIR_project: Obfsproxy - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - project: pycrypto - name: pycrypto - - project: twisted - name: twisted - - project: argparse - name: argparse - - project: parsley - name: parsley - - project: pyptlib - name: pyptlib - - project: pyyaml - name: pyyaml - - project: txsocksx - name: txsocksx - - project: zope.interface - name: zope.interface diff --git a/projects/parsley/build b/projects/parsley/build deleted file mode 100644 index e32060b..0000000 --- a/projects/parsley/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/Parsley-[% c('version') %].tar.gz -cd /var/tmp/build/Parsley-[% c('version') %] -PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/parsley.py build/ometa build/terml $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/parsley/config b/projects/parsley/config deleted file mode 100644 index 72d5bfc..0000000 --- a/projects/parsley/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 1.2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - URL: 'https://pypi.python.org/packages/source/P/Parsley/Parsley-[% c("version") %].tar.gz' - sha256sum: 50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 diff --git a/projects/pycrypto/build b/projects/pycrypto/build deleted file mode 100644 index 3162296..0000000 --- a/projects/pycrypto/build +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -e -[% c("var/set_default_env") -%] -[% c("var/setarch") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/linux-i686") -%] - export CFLAGS=-m32 - export CXXFLAGS=-m32 - export LDFLAGS=-m32 -[% END -%] -export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] -./configure --build=i686-linux-gnu [% c("var/configure_opt") %] -$PYTHON setup.py build --build-lib build -cp -a build/Crypto $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/pycrypto/config b/projects/pycrypto/config deleted file mode 100644 index 56fe397..0000000 --- a/projects/pycrypto/config +++ /dev/null @@ -1,38 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 2.6.1 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 - -targets: - linux-x86_64: - var: - arch_deps: - - python-dev - - python-setuptools - - linux-i686: - var: - pre_pkginst: | - dpkg --add-architecture i386 - # python2.7:i386 cannot be installed because the mime-support package - # in wheezy is not marked "Multi-Arch: foreign": - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 - # We fix this by installing the jessie mime-support package. - wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… - echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c - dpkg -i mime-support_3.58_all.deb - post_pkginst: | - export DEBIAN_FRONTEND=noninteractive - apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 - apt-get install -q -y hardening-wrapper - apt-get download -q -y python-setuptools python-pkg-resources - dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb - -input_files: - - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - URL: 'https://pypi.python.org/packages/source/p/pycrypto/pycrypto-[% c("version") %].tar.gz' - sha256sum: f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/projects/pyptlib/build b/projects/pyptlib/build deleted file mode 100644 index 1dc0c07..0000000 --- a/projects/pyptlib/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/pyptlib $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/pyptlib/config b/projects/pyptlib/config deleted file mode 100644 index e8ca100..0000000 --- a/projects/pyptlib/config +++ /dev/null @@ -1,21 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 0.0.6 -git_url: https://git.torproject.org/pluggable-transports/pyptlib.git -git_hash: 'pyptlib-[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: pyptlib.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image diff --git a/projects/pyyaml/build b/projects/pyyaml/build deleted file mode 100644 index c10855c..0000000 --- a/projects/pyyaml/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/PyYAML-[% c('version') %].tar.gz -cd /var/tmp/build/PyYAML-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/yaml $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/pyyaml/config b/projects/pyyaml/config deleted file mode 100644 index 5324c10..0000000 --- a/projects/pyyaml/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 3.11 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - URL: 'https://pypi.python.org/packages/source/P/PyYAML/PyYAML-[% c("version") %].tar.gz' - sha256sum: c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 diff --git a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE index c6efd2c..8bf0661 100644 --- a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE +++ b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE @@ -145,284 +145,6 @@ OpenSSL =============================================================================== -M2Crypto - -Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved. - -Portions copyright (c) 2004-2006 Open Source Applications Foundation. -All rights reserved. - -Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. -All rights reserved. - -Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation. - -THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -=============================================================================== - -py2exe - -Windows binary packages are built using py2exe. - -Copyright (c) 2000-2008 Thomas Heller, Mark Hammond, Jimmy Retzlaff - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -=============================================================================== - -pyptlib - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - - * Neither the names of the copyright owners nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -=============================================================================== - -PyCrypto - -To the best of our knowledge, with the exceptions noted below or -within the files themselves, the files that constitute PyCrypto are in -the public domain. Most are distributed with the following notice: - - The contents of this file are dedicated to the public domain. To - the extent that dedication to the public domain is not available, - everyone is granted a worldwide, perpetual, royalty-free, - non-exclusive license to exercise all rights associated with the - contents of this file for any purpose whatsoever. - No rights are reserved. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - -Exceptions: - - - Portions of HMAC.py and setup.py are derived from Python 2.2, and - are therefore Copyright (c) 2001, 2002, 2003 Python Software - Foundation (All Rights Reserved). They are licensed by the PSF - under the terms of the Python 2.2 license. (See the file - LEGAL/copy/LICENSE.python-2.2 for details.) - - - The various GNU autotools (autoconf, automake, aclocal, etc.) are - used during the build process. This includes macros from - autoconf-archive, which are located in the m4/ directory. As is - customary, some files from the GNU autotools are included in the - source tree (in the root directory, and in the build-aux/ - directory). These files are merely part of the build process, and - are not included in binary builds of the software. - -EXPORT RESTRICTIONS: - -Note that the export or re-export of cryptographic software and/or -source code may be subject to regulation in your jurisdiction. - -=============================================================================== - -Twisted - -Copyright (c) 2001-2013 -Allen Short -Andy Gayton -Andrew Bennetts -Antoine Pitrou -Apple Computer, Inc. -Benjamin Bruheim -Bob Ippolito -Canonical Limited -Christopher Armstrong -David Reid -Donovan Preston -Eric Mangold -Eyal Lotem -Itamar Turner-Trauring -James Knight -Jason A. Mobarak -Jean-Paul Calderone -Jessica McKellar -Jonathan Jacobs -Jonathan Lange -Jonathan D. Simms -Jürgen Hermann -Kevin Horn -Kevin Turner -Mary Gardiner -Matthew Lefkowitz -Massachusetts Institute of Technology -Moshe Zadka -Paul Swartz -Pavel Pergamenshchik -Ralph Meijer -Sean Riley -Software Freedom Conservancy -Travis B. Hartwell -Thijs Triemstra -Thomas Herve -Timothy Allen - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -=============================================================================== - -zope.interface - -# Copyright (c) 2006 Zope Corporation and Contributors. -# All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE. - -Zope Public License (ZPL) Version 2.1 -------------------------------------- - -A copyright notice accompanies this license document that -identifies the copyright holders. - -This license has been certified as open source. It has also -been designated as GPL compatible by the Free Software -Foundation (FSF). - -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the -following conditions are met: - -1. Redistributions in source code must retain the - accompanying copyright notice, this list of conditions, - and the following disclaimer. - -2. Redistributions in binary form must reproduce the accompanying - copyright notice, this list of conditions, and the - following disclaimer in the documentation and/or other - materials provided with the distribution. - -3. Names of the copyright holders must not be used to - endorse or promote products derived from this software - without prior written permission from the copyright - holders. - -4. The right to distribute this software or to use it for - any purpose does not give you the right to use - Servicemarks (sm) or Trademarks (tm) of the copyright - holders. Use of them is covered by separate agreement - with the copyright holders. - -5. If any files are modified, you must cause the modified - files to carry prominent notices stating that you changed - the files and the date of any change. - -Disclaimer - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' - AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT - NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - NO EVENT SHALL THE COPYRIGHT HOLDERS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - DAMAGE. - -=============================================================================== - -argparse - -argparse is (c) 2006-2009 Steven J. Bethard <steven.bethard(a)gmail.com>. - -The argparse module was contributed to Python as of Python 2.7 and thus -was licensed under the Python license. Same license applies to all files in -the argparse package project. - -For details about the Python License, please see LICENSE.PYTHON. - -=============================================================================== - goptlib To the extent possible under law, the authors have dedicated all diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index d9988fb..75d5c5e 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -1,6 +1,3 @@ -## fteproxy configuration -ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.wrapper --managed - ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 45dbb53..1f155d1 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -60,10 +60,6 @@ mv "$TBDIR/meek-http-helper(a)bamsoftware.com.xpi" "$TBDIR/$MEEKPROFILEPATH/extens tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] [% END -%] -[% IF c("var/fteproxy") -%] - tar -C "$TBDIR" -xf [% c('input_files_by_name/fteproxy') %] -[% END -%] - tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %] [% IF c("var/linux") %] @@ -119,24 +115,18 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" -[% IF c("var/linux") -%] +[% IF c("var/linux") || c("var/osx") -%] [% IF ! c("var/snowflake") %] grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> "$GENERATEDPREFSPATH" + >> "$GENERATEDPREFSPATH" [% ELSE %] cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" [% END %] [% END -%] [% IF c("var/windows") -%] - # We don't have snowflake and FTE available on Windows (yet). - grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js | \ - grep -v 'default_bridge\.fte' >> "$GENERATEDPREFSPATH" -[% END -%] -[% IF c("var/osx") -%] - # FTE is temporarily removed due to bug 18495. - grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \ - [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \ - >> "$GENERATEDPREFSPATH" + # We don't have snowflake available on Windows (yet). + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ + >> "$GENERATEDPREFSPATH" [% END -%] cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/user.js" diff --git a/projects/tor-browser/config b/projects/tor-browser/config index ad382e2..ee62944 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,9 +74,6 @@ input_files: - project: obfs4 name: obfs4 enable: '[% ! c("var/android") %]' - - project: fteproxy - name: fteproxy - enable: '[% c("var/fteproxy") %]' - project: snowflake name: snowflake enable: '[% c("var/snowflake") %]' diff --git a/projects/twisted/build b/projects/twisted/build deleted file mode 100644 index 3ce2eb0..0000000 --- a/projects/twisted/build +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/Twisted-[% c('version') %].tar.bz2 -cd /var/tmp/build/Twisted-[% c('version') %] -[% IF c("var/linux-i686") -%] - export CFLAGS=-m32 - export CXXFLAGS=-m32 - export LDFLAGS=-m32 -[% END -%] -export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] -$PYTHON setup.py build --build-lib build -cp -a build/twisted $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/twisted/config b/projects/twisted/config deleted file mode 100644 index bbe3fc5..0000000 --- a/projects/twisted/config +++ /dev/null @@ -1,39 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 13.2.0 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux-x86_64: - var: - arch_deps: - - python-setuptools - - python-dev - - linux-i686: - var: - pre_pkginst: | - dpkg --add-architecture i386 - # python2.7:i386 cannot be installed because the mime-support package - # in wheezy is not marked "Multi-Arch: foreign": - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 - # We fix this by installing the jessie mime-support package. - wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… - echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c - dpkg -i mime-support_3.58_all.deb - post_pkginst: | - export DEBIAN_FRONTEND=noninteractive - apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 - apt-get install -q -y hardening-wrapper - apt-get download -q -y python-setuptools python-pkg-resources - dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb - -input_files: - - project: container-image - - URL: 'https://pypi.python.org/packages/source/T/Twisted/Twisted-[% c("version") %].tar.bz2' - sha256sum: 095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' diff --git a/projects/txsocksx/build b/projects/txsocksx/build deleted file mode 100644 index 3491a26..0000000 --- a/projects/txsocksx/build +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -# Let's pretend we have the setup dependency already as we don't want to get -# it downloaded during building. Just pretending and thus avoiding another -# dependency should be fine here as txsocksx catches the exception due to -# missing __version__ and __sha__ . -mkdir vcversioner-1.14.1.1-py2.7.egg -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/txsocksx $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/txsocksx/config b/projects/txsocksx/config deleted file mode 100644 index 6142943..0000000 --- a/projects/txsocksx/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/habnabit/txsocksx.git -git_hash: 216eb0894a1755872f4789f9458aa6cf543b8433 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image diff --git a/projects/zope.interface/build b/projects/zope.interface/build deleted file mode 100644 index 23501a3..0000000 --- a/projects/zope.interface/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR -mkdir -p /var/tmp/build -unzip -d /var/tmp/build $rootdir/[% project %]-[% c('version') %].zip -cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/zope $PTDIR/ -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/zope.interface/config b/projects/zope.interface/config deleted file mode 100644 index 9743b79..0000000 --- a/projects/zope.interface/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 4.0.5 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - linux: - var: - arch_deps: - - python-setuptools - - python-dev - -input_files: - - project: container-image - - URL: 'https://pypi.python.org/packages/source/z/zope.interface/zope.interface-[% c("version") %].zip' - sha256sum: 1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc diff --git a/rbm.conf b/rbm.conf index 2202776..b6b2acf 100644 --- a/rbm.conf +++ b/rbm.conf @@ -196,7 +196,6 @@ targets: # API 16 is the minimum we currently support for Tor Browser on Android android_min_api: 16 snowflake: 0 - fteproxy: 0 container: suite: stretch arch: amd64 @@ -237,7 +236,6 @@ targets: # We only build snowflake for linux and macOS on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' - fteproxy: 1 container: suite: wheezy arch: amd64 @@ -297,7 +295,6 @@ targets: LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 - fteproxy: 0 deps: - build-essential - python

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits May 2019