- tor-commits - lists.torproject.org

[ooni-probe/master] Add obfsproxy support to BridgeT
by art＠torproject.org 10 Feb '12

10 Feb '12

commit 2b72638b5f1afea23348def754ce24beb9c11c75 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Feb 10 15:06:23 2012 +0100 Add obfsproxy support to BridgeT --- refactor/tests/bridget.py | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 71d210a..12e3fa1 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -38,11 +38,22 @@ class BridgeT(Plugoo): socksport = random.randint(49152, 65535) randomname = "tor_"+str(random.randint(0, 424242424242)) datadir = "/tmp/" + randomname - torrc = """SocksPort %s + if bridge.startswith("obfs://"): + obfsbridge = bridge.split("/")[1] + torrc = """SocksPort %s +UseBridges 1 +DataDirectory %s +Bridge obfs2 %s +ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed +""" % (socksport, obfsbridge, datadir) + + else: + torrc = """SocksPort %s UseBridges 1 bridge %s DataDirectory %s """ % (socksport, bridge, datadir) + try: f = open(randomname, "wb") f.write(torrc)

1 0

[ooni-probe/master] Set high timeout for job completions
by art＠torproject.org 10 Feb '12

10 Feb '12

commit e1537c500c7638da20cb09ffea6f642138bdefdf Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 23:05:28 2012 +0100 Set high timeout for job completions --- refactor/plugoo.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/refactor/plugoo.py b/refactor/plugoo.py index 0a41a2c..1540034 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -281,7 +281,7 @@ class Plugoo(): print ret self.report(ret) - def run(self, assets=None, buffer=10, timeout=30): + def run(self, assets=None, buffer=10, timeout=100000): self.logger.info("Starting %s", self.name) jobs = [] if assets:

1 0

[ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by art＠torproject.org 10 Feb '12

10 Feb '12

commit 790cb1fe16d54b2328b8e9c12293d74dffb69125 Merge: 2b72638 966435d Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Feb 10 15:06:42 2012 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe refactor/ooni-probe.conf | 1 + refactor/plugoo.py | 2 +- refactor/tests/bridget.py | 3 +++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --cc refactor/tests/bridget.py index 12e3fa1,cea0d91..cb77c89 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@@ -52,8 -42,8 +52,9 @@@ ClientTransportPlugin obfs2 exec /usr/l UseBridges 1 bridge %s DataDirectory %s + usemicrodescriptors 0 """ % (socksport, bridge, datadir) + try: f = open(randomname, "wb") f.write(torrc)

1 0

[ooni-probe/master] Set usemicrodescriptors 0 to overcome #4013 in 2.3.x
by art＠torproject.org 10 Feb '12

10 Feb '12

commit 1c879eb6a4f1af10dde33ed90bca6e5772b0048a Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 23:29:04 2012 +0100 Set usemicrodescriptors 0 to overcome #4013 in 2.3.x --- refactor/tests/bridget.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 42dbfdc..cb77c89 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -52,6 +52,7 @@ ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed UseBridges 1 bridge %s DataDirectory %s +usemicrodescriptors 0 """ % (socksport, bridge, datadir) try:

1 0

[ooni-probe/master] Add support for obfs2 obfsproxy bridge testing
by art＠torproject.org 10 Feb '12

10 Feb '12

commit 8acea0c0696796f689a42d833acfbda5c0129a1c Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Feb 10 15:13:49 2012 +0100 Add support for obfs2 obfsproxy bridge testing --- refactor/tests/bridget.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index cb77c89..2d1126f 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -39,14 +39,14 @@ class BridgeT(Plugoo): randomname = "tor_"+str(random.randint(0, 424242424242)) datadir = "/tmp/" + randomname if bridge.startswith("obfs://"): - obfsbridge = bridge.split("/")[1] + obfsbridge = bridge.split("//")[1] torrc = """SocksPort %s UseBridges 1 -DataDirectory %s Bridge obfs2 %s +DataDirectory %s ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed """ % (socksport, obfsbridge, datadir) - + print torrc else: torrc = """SocksPort %s UseBridges 1

1 0

[ooni-probe/master] Parametrize timeout in bridge testing
by art＠torproject.org 10 Feb '12

10 Feb '12

commit 7c5674e2756e0f07436a0f6917eca07d36d55c76 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 23:03:40 2012 +0100 Parametrize timeout in bridge testing --- refactor/ooni-probe.conf | 1 + refactor/tests/bridget.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/refactor/ooni-probe.conf b/refactor/ooni-probe.conf index 75302f8..2e22961 100644 --- a/refactor/ooni-probe.conf +++ b/refactor/ooni-probe.conf @@ -51,6 +51,7 @@ keyword_method = http,telnet ### Tor bridge testing tor_bridges = bridgetests.txt +tor_bridges_timeout = 40 [report] file = report.log diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 12e3fa1..42dbfdc 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -65,6 +65,8 @@ DataDirectory %s def connect(self, bridge, timeout=None): if not timeout: + if self.config.tests.tor_bridges_timeout: + self.timeout = self.config.tests.tor_bridges_timeout timeout = self.timeout torrc, tordir = self.writetorrc(bridge) cmd = ["tor", "-f", torrc]

1 0

[ooni-probe/master] Add support for obfs2 obfsproxy bridge testing
by art＠torproject.org 10 Feb '12

10 Feb '12

commit c5ac8a46c01d0569b8bb9b69dd20d99fac28e99c Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Feb 10 15:13:49 2012 +0100 Add support for obfs2 obfsproxy bridge testing --- refactor/ooni-probe.conf | 1 - refactor/plugoo.py | 2 +- refactor/tests/bridget.py | 3 --- 3 files changed, 1 insertions(+), 5 deletions(-) diff --git a/refactor/ooni-probe.conf b/refactor/ooni-probe.conf index 2e22961..75302f8 100644 --- a/refactor/ooni-probe.conf +++ b/refactor/ooni-probe.conf @@ -51,7 +51,6 @@ keyword_method = http,telnet ### Tor bridge testing tor_bridges = bridgetests.txt -tor_bridges_timeout = 40 [report] file = report.log diff --git a/refactor/plugoo.py b/refactor/plugoo.py index 1540034..0a41a2c 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -281,7 +281,7 @@ class Plugoo(): print ret self.report(ret) - def run(self, assets=None, buffer=10, timeout=100000): + def run(self, assets=None, buffer=10, timeout=30): self.logger.info("Starting %s", self.name) jobs = [] if assets: diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index cb77c89..12e3fa1 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -52,7 +52,6 @@ ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed UseBridges 1 bridge %s DataDirectory %s -usemicrodescriptors 0 """ % (socksport, bridge, datadir) try: @@ -66,8 +65,6 @@ usemicrodescriptors 0 def connect(self, bridge, timeout=None): if not timeout: - if self.config.tests.tor_bridges_timeout: - self.timeout = self.config.tests.tor_bridges_timeout timeout = self.timeout torrc, tordir = self.writetorrc(bridge) cmd = ["tor", "-f", torrc]

1 0

r25393: {website} the whitespace in the tt tags appears to actually get onto t (website/trunk/projects/en)
by Roger Dingledine 10 Feb '12

10 Feb '12

Author: arma Date: 2012-02-10 09:59:54 +0000 (Fri, 10 Feb 2012) New Revision: 25393 Modified: website/trunk/projects/en/obfsproxy-instructions.wml Log: the whitespace in the tt tags appears to actually get onto the page Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2012-02-10 07:21:37 UTC (rev 25392) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2012-02-10 09:59:54 UTC (rev 25393) @@ -47,7 +47,8 @@ <tt>$ git clone https://git.torproject.org/obfsproxy.git</tt> The above command should create and populate a directory named - 'obfsproxy' in your current directory. + 'obfsproxy' in your current directory. + Compile obfsproxy: @@ -84,9 +85,9 @@ - <tt> UseBridges 1 </tt> - <tt> Bridge obfs2 128.31.0.34:1051 </tt> - <tt> ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed </tt> + <tt>UseBridges 1</tt> + <tt>Bridge obfs2 128.31.0.34:1051</tt> + <tt>ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed</tt> @@ -117,7 +118,7 @@ - <tt> ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed </tt> + <tt>ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed</tt>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 10 Feb '12

10 Feb '12

commit b6b9224aeee774d2b113fad073417ed463448fe2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 10 09:15:04 2012 +0000 Update translations for orbot --- values-cs/strings.xml | 192 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 192 insertions(+), 0 deletions(-) diff --git a/values-cs/strings.xml b/values-cs/strings.xml new file mode 100644 index 0000000..2ea4297 --- /dev/null +++ b/values-cs/strings.xml @@ -0,0 +1,192 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <string name="app_name">Orbot</string> + <string name="internal_web_url">http://orbot/</string> + <string name="default_web_url">http://check.torproject.org</string> + <string name="secure_default_web_url">https://check.torproject.org</string> + <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> + <string name="control_permission_label">spustit a vypnout Tor</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Orbot se spouští...</string> + <string name="status_activated">Připojen k síti Tor</string> + <string name="status_disabled">\"Orbot je deaktivován</string> + <string name="status_shutting_down">Orbot se vypíná</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> + <string name="not_anonymous_yet">VAROVÁNÍ: Vaše komunikace ještě není anonymní! Prosím nastavte vašim aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A či SOCKS5 proxy 172.0.0.1:9050</string> + <string name="menu_home">Domů</string> + <string name="menu_browse">Prohlížet</string> + <string name="menu_settings">Nastavení</string> + <string name="menu_log">Log</string> + <string name="menu_info">Pomoc</string> + <string name="menu_apps">Aplikace</string> + <string name="menu_start">Zapnout</string> + <string name="menu_stop">Vypnout</string> + <string name="menu_about"></string> + <string name="menu_wizard">Průvodce</string> + <string name="button_help">Pomoc</string> + <string name="button_close">Zavřít</string> + <string name="button_about"></string> + <string name="button_clear_log">Vyčistit log</string> + <string name="menu_verify">Ověřit</string> + <string name="menu_exit">Konec</string> + <string name="powered_by"></string> + <string name="press_to_start">- podržte pro spuštění -</string> + <string name="pref_trans_proxy_group"></string> + <string name="pref_trans_proxy_title"></string> + <string name="pref_trans_proxy_summary">Automatické Torování aplikací</string> + <string name="pref_transparent_all_title">Torovat všechno</string> + <string name="pref_transparent_all_summary">Proxynovat všechny aplikace skrz Tor</string> + <string name="pref_transparent_port_fallback_title">Záložní port pro proxy</string> + <string name="pref_transparent_port_fallback_summary">VAROVÁNÍ: Obchází časté porty (80, 443, etc). *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují.</string> + <string name="pref_transparent_port_title">Seznam portů</string> + <string name="pref_transparent_port_summary">Seznam portů co proxynovat. *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují</string> + <string name="pref_transparent_port_dialog">Zadejte porty pro proxynování</string> + <string name="pref_has_root">Vyžaduje root přístup</string> + <string name="pref_has_root_summary"></string> + <string name="status_install_success"></string> + <string name="status_install_fail"></string> + <string name="title_error"></string> + <string name="wizard_title"></string> + <string name="wizard_btn_tell_me_more"></string> + <string name="btn_next"></string> + <string name="btn_back"></string> + <string name="btn_finish"></string> + <string name="btn_okay"></string> + <string name="btn_cancel"></string> + <string name="wizard_details"></string> + <string name="wizard_details_msg"></string> + <string name="wizard_permissions_root"></string> + <string name="wizard_permissions_stock"></string> + <string name="wizard_premissions_msg_root"></string> + <string name="wizard_permissions_msg_stock"></string> + <string name="wizard_permissions_no_root"></string> + <string name="wizard_permissions_consent"></string> + <string name="wizard_permission_enable_root"></string> + <string name="wizard_configure"></string> + <string name="wizard_configure_msg"></string> + <string name="wizard_configure_all"></string> + <string name="wizard_configure_select_apps"></string> + <string name="wizard_tips_tricks"></string> + <string name="wizard_tips_msg"></string> + <string name="wizard_tips_otrchat"></string> + <string name="wizard_tips_proxy"></string> + <string name="wizard_proxy_help_info"></string> + <string name="wizard_proxy_help_msg"></string> + <string name="wizard_final"></string> + <string name="wizard_final_msg"></string> + <string name="connect_first_time"></string> + <string name="tor_check"></string> + <string name="pref_hs_group"></string> + <string name="pref_general_group"></string> + <string name="pref_start_boot_title"></string> + <string name="pref_start_boot_summary"></string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb"></string> + <string name="orweb_apk_url"></string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> + <string name="status"></string> + <string name="setting_up_full_transparent_proxying_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="openssl_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> + <string name="pref_use_persistent_notifications"></string> + <string name="pref_use_persistent_notifications_title"></string> +</resources>

1 0

r25392: {website} make it clearer you need pkg-config (website/trunk/projects/en)
by Roger Dingledine 10 Feb '12

10 Feb '12

Author: arma Date: 2012-02-10 07:21:37 +0000 (Fri, 10 Feb 2012) New Revision: 25392 Modified: website/trunk/projects/en/obfsproxy-instructions.wml Log: make it clearer you need pkg-config Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2012-02-10 06:13:21 UTC (rev 25391) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2012-02-10 07:21:37 UTC (rev 25392) @@ -22,9 +22,10 @@ - You will need a C compiler (gcc), the Autotools - build system, the git revision control system, - libevent-2 and the development headers of + You will need a C compiler (gcc), the autoconf + and autotools build system, the git revision + control system, pkg-config and libtool, + libevent-2 and its headers, and the development headers of OpenSSL.

1 0