- tor-commits - lists.torproject.org

[tor/master] Note a bug number for 6888
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit 9d3e497edb25d8161ba166ae5cec8fabf8b462fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 16:22:12 2012 -0400 Note a bug number for 6888 --- changes/bug6866 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/bug6866 b/changes/bug6866 index ee1e571..efaab98 100644 --- a/changes/bug6866 +++ b/changes/bug6866 @@ -5,4 +5,5 @@ - Disable the use of Guard nodes when in Tor2WebMode. Guard usage by Tor2Web clients allows hidden services to identity tor2web clients through their repeated selection of the same rendezvous - and introduction point circuit endpoints (their guards). + and introduction point circuit endpoints (their guards). Fixes + bug 6888.

1 0

[tor/maint-0.2.3] Whitespace fixes
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit aca325eb0c6b34ba0e1ef8df16c1cf44a98f9b6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 16:16:17 2012 -0400 Whitespace fixes --- src/or/circuitbuild.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6bd1eb3..ffc7b5e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2646,11 +2646,11 @@ pathbias_count_first_hop(origin_circuit_t *circ) char *rate_msg = NULL; /* Completely ignore one hop circuits */ - if (circ->build_state->onehop_tunnel || - circ->build_state->desired_path_len == 1) { + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { /* Check for inconsistency */ - if (circ->build_state->desired_path_len != 1 || - !circ->build_state->onehop_tunnel) { + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { if ((rate_msg = rate_limit_log(&first_hop_notice_limit, approx_time()))) { log_info(LD_BUG, @@ -2756,11 +2756,11 @@ pathbias_count_success(origin_circuit_t *circ) char *rate_msg = NULL; /* Ignore one hop circuits */ - if (circ->build_state->onehop_tunnel || - circ->build_state->desired_path_len == 1) { + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { /* Check for consistency */ - if (circ->build_state->desired_path_len != 1 || - !circ->build_state->onehop_tunnel) { + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { if ((rate_msg = rate_limit_log(&success_notice_limit, approx_time()))) { log_info(LD_BUG,

1 0

[tor/maint-0.2.3] Bug 6866: Convert pathbias asserts into log messages.
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit 4bfed4378d3b101757e50b058e3d462fa88ecfd3 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Sep 17 18:25:28 2012 -0700 Bug 6866: Convert pathbias asserts into log messages. Asserts were hit by Tor2Web mode. --- changes/bug6866 | 4 ++++ src/or/circuitbuild.c | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/changes/bug6866 b/changes/bug6866 new file mode 100644 index 0000000..561676b --- /dev/null +++ b/changes/bug6866 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Convert an assert in the pathbias code to a log message. Assert + appears to only be triggerable by Tor2Web mode. Fixes bug 6866; + bugfix on 0.2.3.17-beta. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 9d52b5e..6bd1eb3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2646,8 +2646,24 @@ pathbias_count_first_hop(origin_circuit_t *circ) char *rate_msg = NULL; /* Completely ignore one hop circuits */ - if (circ->build_state->onehop_tunnel) { - tor_assert(circ->build_state->desired_path_len == 1); + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { + /* Check for inconsistency */ + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { + if ((rate_msg = rate_limit_log(&first_hop_notice_limit, + approx_time()))) { + log_info(LD_BUG, + "One-hop circuit has length %d. Path state is %s. " + "Circuit is a %s currently %s. %s", + circ->build_state->desired_path_len, + pathbias_state_to_string(circ->path_state), + circuit_purpose_to_string(circ->_base.purpose), + circuit_state_to_string(circ->_base.state), + rate_msg); + } + tor_fragile_assert(); + } return 0; } @@ -2740,8 +2756,24 @@ pathbias_count_success(origin_circuit_t *circ) char *rate_msg = NULL; /* Ignore one hop circuits */ - if (circ->build_state->onehop_tunnel) { - tor_assert(circ->build_state->desired_path_len == 1); + if (circ->build_state->onehop_tunnel || + circ->build_state->desired_path_len == 1) { + /* Check for consistency */ + if (circ->build_state->desired_path_len != 1 || + !circ->build_state->onehop_tunnel) { + if ((rate_msg = rate_limit_log(&success_notice_limit, + approx_time()))) { + log_info(LD_BUG, + "One-hop circuit has length %d. Path state is %s. " + "Circuit is a %s currently %s. %s", + circ->build_state->desired_path_len, + pathbias_state_to_string(circ->path_state), + circuit_purpose_to_string(circ->_base.purpose), + circuit_state_to_string(circ->_base.state), + rate_msg); + } + tor_fragile_assert(); + } return; }

1 0

[tor/master] Print the correct address family in log printout.
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit a989dbc3dcf2d5dd80b279084053fff3e94d124d Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Sep 18 14:41:14 2012 +0200 Print the correct address family in log printout. Look at the address family of the preferred OR port rather than the node.ipv6_preferred flag since the logic has changed with new ClientUseIPv6 config option. Fixes ticket 6884. --- changes/6884 | 4 ++++ src/or/circuitbuild.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/6884 b/changes/6884 new file mode 100644 index 0000000..90585dc --- /dev/null +++ b/changes/6884 @@ -0,0 +1,4 @@ + o Minor bugfixes (client): + - Correct log printout about which address family is preferred + when connecting to a bridge with both an IPv4 and IPv6 OR port. + Fixes bug 6884. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index d496923..515312f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5641,7 +5641,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) "Bridge '%s' has both an IPv4 and an IPv6 address. " "Will prefer using its %s address (%s:%d).", ri->nickname, - node->ipv6_preferred ? "IPv6" : "IPv4", + tor_addr_family(&ap.addr) == AF_INET6 ? "IPv6" : "IPv4", fmt_addr(&ap.addr), ap.port); } }

1 0

[tor/master] specify a version for the bug6884 changes file
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit f675e0a33efa5f32377e784b2612c2b6a5c9180b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 15:54:36 2012 -0400 specify a version for the bug6884 changes file --- changes/6884 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/6884 b/changes/6884 index 90585dc..66801db 100644 --- a/changes/6884 +++ b/changes/6884 @@ -1,4 +1,4 @@ o Minor bugfixes (client): - Correct log printout about which address family is preferred when connecting to a bridge with both an IPv4 and IPv6 OR port. - Fixes bug 6884. + Fixes bug 6884; bugfix on 0.2.4.1-alpha.

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 18 Sep '12

18 Sep '12

commit 27ed2da09879e71fe24115cdef1e29db7143bbab Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 18 18:15:05 2012 +0000 Update translations for orbot --- values-he/strings.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/values-he/strings.xml b/values-he/strings.xml new file mode 100644 index 0000000..92f76f8 --- /dev/null +++ b/values-he/strings.xml @@ -0,0 +1,51 @@ +<?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">התחל ועצור את Tor</string> + <string name="tor_proxy_service_process">שירות הפרוקסי של Tor</string> + <string name="status_starting_up">Orbot מתחיל</string> + <string name="status_activated">מחובר לרשת Tor</string> + <string name="status_disabled">Orbot כבוי</string> + <string name="status_shutting_down">Orbot בתהליך כיבוי</string> + <string name="menu_home">בית</string> + <string name="menu_settings">הגדרות</string> + <string name="menu_info">עזרה</string> + <string name="menu_apps">יישומים</string> + <string name="menu_start">התחל</string> + <string name="menu_stop">עצור</string> + <string name="menu_about">אודות</string> + <string name="menu_wizard">אשף</string> + <string name="button_help">עזרה</string> + <string name="button_close">סגור</string> + <string name="button_about">אודות</string> + <string name="menu_verify">בדיקה</string> + <string name="menu_exit">צא</string> + <string name="press_to_start">-נגיעה ארוכה להתחלה-</string> + <string name="pref_transparent_port_title">רשימת פורטים</string> + <string name="pref_has_root">דרוש רוט</string> + <string name="title_error">שגיאת יישום</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">אודות Orbot</string> + <string name="btn_next">הבא</string> + <string name="btn_back">הקודם</string> + <string name="btn_finish">סיים</string> +  +  +  +  +  +  +  +  +  +  + <string name="default_bridges"/> +</resources>

1 0

[compass/master] Initialise tooltips
by karsten＠torproject.org 18 Sep '12

18 Sep '12

commit 5ef93402b2195339904517fbd331ff57df08dd1b Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 16 10:50:17 2012 +0530 Initialise tooltips --- static/js/custom.js | 1 + templates/index.html | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/static/js/custom.js b/static/js/custom.js index d56f90c..290c1e0 100644 --- a/static/js/custom.js +++ b/static/js/custom.js @@ -27,6 +27,7 @@ function doAjax(){ $('html, body').animate({ scrollTop: $('#result').offset().top }, 1000); + $('span[rel=tooltip]').tooltip(); }); } } diff --git a/templates/index.html b/templates/index.html index f0ab694..4535a68 100644 --- a/templates/index.html +++ b/templates/index.html @@ -164,6 +164,7 @@ --> <script src="{{ url_for('static', filename='js/jquery-1.8.0.min.js') }}"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script> + <script src="{{ url_for('static', filename='js/bootstrap-tooltip.js') }}"></script> <script src="{{ url_for('static', filename='js/custom.js') }}"></script> <script> doAjax();

1 0

[compass/master] Add a 'total' line at the bottom of the table
by karsten＠torproject.org 18 Sep '12

18 Sep '12

commit b894185a7c7770df218436c9d99b6cba1795a134 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 9 20:46:10 2012 +0530 Add a 'total' line at the bottom of the table --- app.py | 22 ++++++++++++++++++++-- templates/result.html | 6 +++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app.py b/app.py index a0d2b05..3a66a79 100644 --- a/app.py +++ b/app.py @@ -26,6 +26,7 @@ class Opt(object): class Result(): def __init__(self): + self.index = None self.cw = None self.adv_bw = None self.p_guard = None @@ -66,6 +67,7 @@ def parse(output_string, grouping=False, sort_key=None): # TODO: change inaccurate value of 10 if len(values) > 10: + result.index = id result.cw = values[0] result.adv_bw = values[1] result.p_guard = values[2] @@ -89,6 +91,23 @@ def parse(output_string, grouping=False, sort_key=None): sorted_results[key] = [result] else: results.append(result) + else: + result.index = "" + result.cw = values[0] + result.adv_bw = values[1] + result.p_guard = values[2] + result.p_middle = values[3] + result.p_exit = values[4] + result.nick = "" + result.fp = ' '.join(values[5:]) + result.exit = "" + result.guard = "" + result.cc = "" + result.as_no = "" + result.as_name = "" + result.as_info = "" + results.append(result) + return results if results else sorted_results @app.route('/') @@ -130,7 +149,6 @@ def result(): short=None, links=None) results = parse(output_string, options.by_country or options.by_as, sort_key) - if sort_key: for key in sorted(results.iterkeys(), reverse=True): for value in results[key]: @@ -138,7 +156,7 @@ def result(): else: relays = results - return render_template('result.html', results=relays) + return render_template('result.html', results=relays, grouping=options.by_as or options.by_country) if __name__ == '__main__': # Bind to PORT if defined, otherwise default to 5000. diff --git a/templates/result.html b/templates/result.html index 190e8fc..5fad51c 100644 --- a/templates/result.html +++ b/templates/result.html @@ -19,15 +19,15 @@ <tbody> {% for result in results %} <tr> - <td>{{ loop.index }}</td> + <td>{{ result.index }}</td> <td>{{ result.cw }}</td> <td>{{ result.adv_bw }}</td> <td>{{ result.p_guard }}</td> <td>{{ result.p_middle }}</td> <td>{{ result.p_exit }}</td> <td>{{ result.nick }}</td> -  - {% if "relays" in result.fp %} +  + {% if result.fp|length != 40 %} <td>{{ result.fp }}</td> {% else %} <td><a href="https://atlas.torproject.org/#details/{{ result.fp }}">{{ result.fp[:8] }}</a></td>

1 0

[compass/master] Merge remote-tracking branch 'gsathya/bug_6677'
by karsten＠torproject.org 18 Sep '12

18 Sep '12

commit 7c231ae1029d04e8d3a19e8106539a55e6c5b265 Merge: aefd024 b894185 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 18 11:52:22 2012 -0400 Merge remote-tracking branch 'gsathya/bug_6677' app.py | 22 ++++++++++++++++++++-- templates/result.html | 6 +++--- 2 files changed, 23 insertions(+), 5 deletions(-)

1 0

r25796: {website} Adding GSoC 2012 contributors GSoC contributors for 2012 (mi (website/trunk/about/en)
by Damian Johnson 18 Sep '12

18 Sep '12

Author: atagar Date: 2012-09-18 14:20:57 +0000 (Tue, 18 Sep 2012) New Revision: 25796 Modified: website/trunk/about/en/volunteers.wml Log: Adding GSoC 2012 contributors GSoC contributors for 2012 (minus Julien since he dropped out early). I don't recall Michele or vmon giving permission to use their application nor a link for their project so no links for them. Addition suggested by gsathya. Modified: website/trunk/about/en/volunteers.wml =================================================================== --- website/trunk/about/en/volunteers.wml 2012-09-15 02:46:34 UTC (rev 25795) +++ website/trunk/about/en/volunteers.wml 2012-09-18 14:20:57 UTC (rev 25796) @@ -12,6 +12,13 @@ <div id="maincol"> <h1>Volunteers</h1> <dl> +<dt>Google Summer of Code, 2012</dt><dd> +Brandon Wiley - <a href="http://stepthreeprivacy.org/">Python Pluggable Transports</a><br /> +Feroze Naina - <a href="http://feroze.in/gsoc12.html">Hidden Service Configuration</a><br /> +Michele Orrù - APAF<br /> +Ravi Padmala - <a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a><br /> +vmon - Stegotorus</dd> + <dt>Google Summer of Code, 2011</dt><dd> Brandon Wiley - <a href="http://stepthreeprivacy.org/">Blocking-resistant Transport Evaluation Framework</a><br /> George Kadianakis - <a href="https://gitorious.org/obfsproxy/pages/Home">Pluggable transports</a><br /> @@ -19,6 +26,7 @@ Kamran Khan - <a href="http://code.inspirated.com/">GTK+ Frontend and Client Mode Improvements for arm</a><br /> Max - <a href="https://tails.boum.org/todo/TailsGreeter/blog/">Custom GDM3 startup menu, aka. tails-greeter</a><br /> Sathyanarayanan Gunasekaran - <a href="http://gsathya.in/blog/">GSoC : Orbot + ORLib</a></dd> + <dt>Anonym, bertagaz, and intrigeri</dt><dd>Maintainers of <a href="https://tails.boum.org/">The Amnesic Incognito Live System</a>.</dd> <dt>Marco Bonetti</dt><dd>Focusing on MobileTor for the iPhone.</dd>

1 0