- tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 05 Apr '12

05 Apr '12

commit dd4973604783d617e7803f8f468d6062c07278ea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 5 16:45:27 2012 +0000 Update translations for https_everywhere --- ru/ssl-observatory.dtd | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ru/ssl-observatory.dtd b/ru/ssl-observatory.dtd index e129125..d741fc0 100644 --- a/ru/ssl-observatory.dtd +++ b/ru/ssl-observatory.dtd @@ -20,13 +20,13 @@ to turn it on?">-->  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"Включение данной опции безопасно, за исключением случая когда вы используете очень навязчивую корпоративную сеть:"> +"Включение данной опции безопасно, кроме случая когда вы используете очень навязчивую корпоративную сеть:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -""> +"Безопасно, кроме случая когда вы используете корпоративную сеть с секретными именами серверов:"> <!ENTITY ssl-observatory.prefs.alt_roots -""> +"Отправить и проверить сертификаты подписанные нестандартными корневыми центрами сертификации"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip ""> @@ -38,7 +38,7 @@ to turn it on?">--> "Эта опция требует наличия установленных Tor и Torbutton"> <!ENTITY ssl-observatory.prefs.asn -""> +"Когда вы получаете новый сертификат, сообщайте Observatory к какому провайдеру вы подключены"> <!ENTITY ssl-observatory.prefs.asn_tooltip ""> @@ -73,13 +73,13 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.show "Показать дополнительные опции"> -<!ENTITY ssl-observatory.prefs.title ""> +<!ENTITY ssl-observatory.prefs.title "Настройки SSL Observatory"> -<!ENTITY ssl-observatory.prefs.use ""> -<!ENTITY ssl-observatory.warning.title ""> +<!ENTITY ssl-observatory.prefs.use "Использовать Observatory?"> +<!ENTITY ssl-observatory.warning.title "ПРЕДУПРЕЖДЕНИЕ от EFF SSL Observatory"> <!ENTITY ssl-observatory.warning.showcert "Показать цепочку сертификатов"> <!ENTITY ssl-observatory.warning.okay "Я понимаю"> -<!ENTITY ssl-observatory.warning.text ""> -<!ENTITY ssl-observatory.warning.defense ""> +<!ENTITY ssl-observatory.warning.text "EFF SSL Observatory выдал предупреждение на счет HTTPS сертификат(-а/-ов) для данного сайта:"> +<!ENTITY ssl-observatory.warning.defense "Если вы вошли в систему на данном сайте, может быть целесообразно сменить пароль после установки безопасного соединения.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 05 Apr '12

05 Apr '12

commit 9e2f3fa79d718f12bade83ceb7967db2c4403306 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 5 16:15:29 2012 +0000 Update translations for https_everywhere --- ru/ssl-observatory.dtd | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ru/ssl-observatory.dtd b/ru/ssl-observatory.dtd index e28c954..e129125 100644 --- a/ru/ssl-observatory.dtd +++ b/ru/ssl-observatory.dtd @@ -1,9 +1,11 @@  -<!ENTITY ssl-observatory.popup.details ""> +<!ENTITY ssl-observatory.popup.details "Подробная информация и Сведения о конфиденциальности"> <!ENTITY ssl-observatory.popup.later "Спросить позже"> <!ENTITY ssl-observatory.popup.no "Нет"> -<!ENTITY ssl-observatory.popup.text ""> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere может распознавать атаки +на ваш браузер путем отправки получаемых сертификатов в +Observatory. Включить данную опцию?">  <!ENTITY ssl-observatory.popup.title -""> +"Должен ли HTTPS Everywhere использовать SSL Observatory?"> <!ENTITY ssl-observatory.popup.yes "Да">  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -""> +"Включение данной опции безопасно, за исключением случая когда вы используете очень навязчивую корпоративную сеть:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 "">

1 0

[arm/master] Logging rather than raising on unrecognized auth method
by atagar＠torproject.org 05 Apr '12

05 Apr '12

commit d1b56733f521a33eb44d0ba86001d8fd40e242af Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 5 08:14:09 2012 -0700 Logging rather than raising on unrecognized auth method Part of the code that I copied from TorCtl raises an IOError when we get an unrecognized auth method (my bad, I wrote it). Changing that in our copy to log a warning instead. Caught by "E" (email subject: SAFECOOKIE) --- src/util/torTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index a4ab70c..d132e28 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -430,7 +430,7 @@ class FixedConnection(TorCtl.Connection): # not of a recognized authentication type (new addition to the # control-spec?) - raise IOError("Unrecognized authentication type: %s" % authEntry) + log.log(log.WARN, "Unrecognized authentication type: %s" % authEntry) elif entry.startswith("COOKIEFILE=\"") and entry.endswith("\""): # Quoted path of the authentication cookie. This only exists if we're # using cookie auth and, of course, doesn't account for chroot.

1 0

[flashproxy/js] Move puts to the global scope.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 795e366400df1fbe3fb1cdb1ff05581c0bcb02da Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:17:23 2012 -0700 Move puts to the global scope. --- flashproxy.js | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 6e13ff4..d076aa5 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -52,6 +52,25 @@ var MIN_RATE_LIMIT = 10 * 1024; var RATE_LIMIT_HISTORY = 5.0; var query = parse_query_string(window.location.search.substr(1)); +var debug_div; + +if (query.debug) { + debug_div = document.createElement("pre"); + debug_div.className = "debug"; +} + +function puts(s) +{ + if (debug_div) { + var at_bottom; + + /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ + at_bottom = (debug_div.scrollTop + debug_div.clientHeight == debug_div.scrollHeight); + debug_div.appendChild(document.createTextNode(s + "\n")); + if (at_bottom) + debug_div.scrollTop = debug_div.scrollHeight; + } +} /* Parse a URL query string or application/x-www-form-urlencoded body. The return type is an object mapping string keys to string values. By design, @@ -233,31 +252,15 @@ function make_websocket(addr) function FlashProxy() { - var debug_div; var rate_limit; this.badge = new Badge(); - if (query.debug) { - debug_div = document.createElement("pre"); - debug_div.className = "debug"; + if (query.debug) this.badge_elem = debug_div; - } else { + else this.badge_elem = this.badge.elem; - } this.badge_elem.setAttribute("id", "flashproxy-badge"); - function puts(s) { - if (debug_div) { - var at_bottom; - - /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ - at_bottom = (debug_div.scrollTop + debug_div.clientHeight == debug_div.scrollHeight); - debug_div.appendChild(document.createTextNode(s + "\n")); - if (at_bottom) - debug_div.scrollTop = debug_div.scrollHeight; - } - }; - this.proxy_pairs = []; this.start = function() {

1 0

[flashproxy/js] Move ProxyPair out of the FlashProxy class.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit b105c5eeae29872337e77ab8381e24e50ad14b98 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:18:27 2012 -0700 Move ProxyPair out of the FlashProxy class. --- flashproxy.js | 261 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 130 insertions(+), 131 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index d076aa5..94154b1 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -252,8 +252,6 @@ function make_websocket(addr) function FlashProxy() { - var rate_limit; - this.badge = new Badge(); if (query.debug) this.badge_elem = debug_div; @@ -294,13 +292,13 @@ function FlashProxy() else rate_limit_bytes = get_query_param_byte_count(query, "ratelimit", DEFAULT_RATE_LIMIT); if (rate_limit_bytes === undefined) { - rate_limit = new DummyRateLimit(); + this.rate_limit = new DummyRateLimit(); } else if (rate_limit_bytes == null || rate_limit_bytes < MIN_FACILITATOR_POLL_INTERVAL) { puts("Error: ratelimit must be a nonnegative number at least " + MIN_RATE_LIMIT + "."); this.die(); return; } else { - rate_limit = new BucketRateLimit(rate_limit_bytes * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); + this.rate_limit = new BucketRateLimit(rate_limit_bytes * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); } client_addr = get_query_param_addr(query, "client"); @@ -395,7 +393,7 @@ function FlashProxy() this.make_proxy_pair = function(client_addr, relay_addr) { var proxy_pair; - proxy_pair = new ProxyPair(client_addr, relay_addr); + proxy_pair = new ProxyPair(client_addr, relay_addr, this.rate_limit); this.proxy_pairs.push(proxy_pair); proxy_pair.complete_callback = function(event) { puts("Complete."); @@ -412,138 +410,156 @@ function FlashProxy() puts("die"); this.badge.set_color("#111"); } +} - /* An instance of a client-relay connection. */ - function ProxyPair(client_addr, relay_addr) - { - function log(s) - { - puts(s) - } +/* This is the non-functional badge that occupies space when + flashproxy_should_disable decides that the proxy shouldn't run. */ +function DummyFlashProxy() +{ + var img; - this.client_addr = client_addr; - this.relay_addr = relay_addr; + img = document.createElement("img"); + img.setAttribute("src", "https://crypto.stanford.edu/flashproxy/badge.png"); + img.setAttribute("border", 0); + img.setAttribute("id", "flashproxy-badge"); - this.c2r_schedule = []; - this.r2c_schedule = []; + this.badge_elem = img; - this.running = true; - this.flush_timeout_id = null; + this.start = function() { + }; +} - /* This callback function can be overridden by external callers. */ - this.complete_callback = function() { - }; +/* An instance of a client-relay connection. */ +function ProxyPair(client_addr, relay_addr, rate_limit) +{ + function log(s) + { + puts(s) + } - /* Return a function that shows an error message and closes the other - half of a communication pair. */ - this.make_onerror_callback = function(partner) - { - return function(event) { - var ws = event.target; + this.client_addr = client_addr; + this.relay_addr = relay_addr; + this.rate_limit = rate_limit; - log(ws.label + ": error."); - partner.close(); - }.bind(this); - }; + this.c2r_schedule = []; + this.r2c_schedule = []; - this.onopen_callback = function(event) { - var ws = event.target; + this.running = true; + this.flush_timeout_id = null; - log(ws.label + ": connected."); - }.bind(this); + /* This callback function can be overridden by external callers. */ + this.complete_callback = function() { + }; - this.onclose_callback = function(event) { + /* Return a function that shows an error message and closes the other + half of a communication pair. */ + this.make_onerror_callback = function(partner) + { + return function(event) { var ws = event.target; - log(ws.label + ": closed."); - this.flush(); - - if (this.running && is_closed(this.client_s) && is_closed(this.relay_s)) { - this.running = false; - this.complete_callback(); - } + log(ws.label + ": error."); + partner.close(); }.bind(this); + }; - this.onmessage_client_to_relay = function(event) { - this.c2r_schedule.push(event.data); - this.flush(); - }.bind(this); + this.onopen_callback = function(event) { + var ws = event.target; - this.onmessage_relay_to_client = function(event) { - this.r2c_schedule.push(event.data); - this.flush(); - }.bind(this); + log(ws.label + ": connected."); + }.bind(this); - this.connect = function() { - log("Client: connecting."); - this.client_s = make_websocket(this.client_addr); - - log("Relay: connecting."); - this.relay_s = make_websocket(this.relay_addr); - - this.client_s.label = "Client"; - this.client_s.onopen = this.onopen_callback; - this.client_s.onclose = this.onclose_callback; - this.client_s.onerror = this.make_onerror_callback(this.relay_s); - this.client_s.onmessage = this.onmessage_client_to_relay; - - this.relay_s.label = "Relay"; - this.relay_s.onopen = this.onopen_callback; - this.relay_s.onclose = this.onclose_callback; - this.relay_s.onerror = this.make_onerror_callback(this.client_s); - this.relay_s.onmessage = this.onmessage_relay_to_client; - }; - - function is_open(ws) - { - return ws.readyState == ws.OPEN; - } + this.onclose_callback = function(event) { + var ws = event.target; - function is_closed(ws) - { - return ws.readyState == ws.CLOSED; + log(ws.label + ": closed."); + this.flush(); + + if (this.running && is_closed(this.client_s) && is_closed(this.relay_s)) { + this.running = false; + this.complete_callback(); } + }.bind(this); + + this.onmessage_client_to_relay = function(event) { + this.c2r_schedule.push(event.data); + this.flush(); + }.bind(this); + + this.onmessage_relay_to_client = function(event) { + this.r2c_schedule.push(event.data); + this.flush(); + }.bind(this); + + this.connect = function() { + log("Client: connecting."); + this.client_s = make_websocket(this.client_addr); + + log("Relay: connecting."); + this.relay_s = make_websocket(this.relay_addr); + + this.client_s.label = "Client"; + this.client_s.onopen = this.onopen_callback; + this.client_s.onclose = this.onclose_callback; + this.client_s.onerror = this.make_onerror_callback(this.relay_s); + this.client_s.onmessage = this.onmessage_client_to_relay; + + this.relay_s.label = "Relay"; + this.relay_s.onopen = this.onopen_callback; + this.relay_s.onclose = this.onclose_callback; + this.relay_s.onerror = this.make_onerror_callback(this.client_s); + this.relay_s.onmessage = this.onmessage_relay_to_client; + }; - /* Send as much data as the rate limit currently allows. */ - this.flush = function() { - var busy; - - if (this.flush_timeout_id) - clearTimeout(this.flush_timeout_id); - this.flush_timeout_id = null; - - busy = true; - while (busy && !rate_limit.is_limited()) { - var chunk; - - busy = false; - if (is_open(this.client_s) && this.r2c_schedule.length > 0) { - chunk = this.r2c_schedule.shift(); - rate_limit.update(chunk.length); - this.client_s.send(chunk); - busy = true; - } - if (is_open(this.relay_s) && this.c2r_schedule.length > 0) { - chunk = this.c2r_schedule.shift(); - rate_limit.update(chunk.length); - this.relay_s.send(chunk); - busy = true; - } - } + function is_open(ws) + { + return ws.readyState == ws.OPEN; + } + + function is_closed(ws) + { + return ws.readyState == ws.CLOSED; + } + + /* Send as much data as the rate limit currently allows. */ + this.flush = function() { + var busy; + + if (this.flush_timeout_id) + clearTimeout(this.flush_timeout_id); + this.flush_timeout_id = null; - if (is_closed(this.relay_s) && !is_closed(this.client_s) && this.r2c_schedule.length == 0) { - log("Client: closing."); - this.client_s.close(); + busy = true; + while (busy && !this.rate_limit.is_limited()) { + var chunk; + + busy = false; + if (is_open(this.client_s) && this.r2c_schedule.length > 0) { + chunk = this.r2c_schedule.shift(); + this.rate_limit.update(chunk.length); + this.client_s.send(chunk); + busy = true; } - if (is_closed(this.client_s) && !is_closed(this.relay_s) && this.c2r_schedule.length == 0) { - log("Relay: closing."); - this.relay_s.close(); + if (is_open(this.relay_s) && this.c2r_schedule.length > 0) { + chunk = this.c2r_schedule.shift(); + this.rate_limit.update(chunk.length); + this.relay_s.send(chunk); + busy = true; } + } - if (this.r2c_schedule.length > 0 || this.c2r_schedule.length > 0) - this.flush_timeout_id = setTimeout(this.flush.bind(this), rate_limit.when() * 1000); - }; - } + if (is_closed(this.relay_s) && !is_closed(this.client_s) && this.r2c_schedule.length == 0) { + log("Client: closing."); + this.client_s.close(); + } + if (is_closed(this.client_s) && !is_closed(this.relay_s) && this.c2r_schedule.length == 0) { + log("Relay: closing."); + this.relay_s.close(); + } + + if (this.r2c_schedule.length > 0 || this.c2r_schedule.length > 0) + this.flush_timeout_id = setTimeout(this.flush.bind(this), this.rate_limit.when() * 1000); + }; } function BucketRateLimit(capacity, time) @@ -670,23 +686,6 @@ function Badge() this.refresh(); } -/* This is the non-functional badge that occupies space when - flashproxy_should_disable decides that the proxy shouldn't run. */ -function DummyFlashProxy() -{ - var img; - - img = document.createElement("img"); - img.setAttribute("src", "https://crypto.stanford.edu/flashproxy/badge.png"); - img.setAttribute("border", 0); - img.setAttribute("id", "flashproxy-badge"); - - this.badge_elem = img; - - this.start = function() { - }; -} - function quote(s) { return "\"" + s.replace(/([\\\"])/, "\\$1") + "\"";

1 0

[flashproxy/js] Make query a global variable.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 1be1f5fd9681e428479ad2fe827f569d29696a98 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:12:16 2012 -0700 Make query a global variable. This conceptually belongs to the whole page, not only to a single FlashProxy instance. --- flashproxy.js | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 9a0b4fa..6e13ff4 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -51,6 +51,8 @@ var DEFAULT_RATE_LIMIT = undefined; var MIN_RATE_LIMIT = 10 * 1024; var RATE_LIMIT_HISTORY = 5.0; +var query = parse_query_string(window.location.search.substr(1)); + /* Parse a URL query string or application/x-www-form-urlencoded body. The return type is an object mapping string keys to string values. By design, this function doesn't support multiple values for the same named parameter, @@ -234,10 +236,8 @@ function FlashProxy() var debug_div; var rate_limit; - this.query = parse_query_string(window.location.search.substr(1)); - this.badge = new Badge(); - if (this.query.debug) { + if (query.debug) { debug_div = document.createElement("pre"); debug_div.className = "debug"; this.badge_elem = debug_div; @@ -265,31 +265,31 @@ function FlashProxy() var relay_addr; var rate_limit_bytes; - this.fac_addr = get_query_param_addr(this.query, "facilitator", DEFAULT_FACILITATOR_ADDR); + this.fac_addr = get_query_param_addr(query, "facilitator", DEFAULT_FACILITATOR_ADDR); if (!this.fac_addr) { puts("Error: Facilitator spec must be in the form \"host:port\"."); this.die(); return; } - this.max_num_proxy_pairs = get_query_param_integer(this.query, "max_clients", DEFAULT_MAX_NUM_PROXY_PAIRS); + this.max_num_proxy_pairs = get_query_param_integer(query, "max_clients", DEFAULT_MAX_NUM_PROXY_PAIRS); if (this.max_num_proxy_pairs == null || this.max_num_proxy_pairs < 0) { puts("Error: max_clients must be a nonnegative integer."); this.die(); return; } - this.facilitator_poll_interval = get_query_param_timespec(this.query, "facilitator_poll_interval", DEFAULT_FACILITATOR_POLL_INTERVAL); + this.facilitator_poll_interval = get_query_param_timespec(query, "facilitator_poll_interval", DEFAULT_FACILITATOR_POLL_INTERVAL); if (this.facilitator_poll_interval == null || this.facilitator_poll_interval < MIN_FACILITATOR_POLL_INTERVAL) { puts("Error: facilitator_poll_interval must be a nonnegative number at least " + MIN_FACILITATOR_POLL_INTERVAL + "."); this.die(); return; } - if (this.query["ratelimit"] == "off") + if (query["ratelimit"] == "off") rate_limit_bytes = undefined; else - rate_limit_bytes = get_query_param_byte_count(this.query, "ratelimit", DEFAULT_RATE_LIMIT); + rate_limit_bytes = get_query_param_byte_count(query, "ratelimit", DEFAULT_RATE_LIMIT); if (rate_limit_bytes === undefined) { rate_limit = new DummyRateLimit(); } else if (rate_limit_bytes == null || rate_limit_bytes < MIN_FACILITATOR_POLL_INTERVAL) { @@ -300,8 +300,8 @@ function FlashProxy() rate_limit = new BucketRateLimit(rate_limit_bytes * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); } - client_addr = get_query_param_addr(this.query, "client"); - relay_addr = get_query_param_addr(this.query, "relay"); + client_addr = get_query_param_addr(query, "client"); + relay_addr = get_query_param_addr(query, "relay"); if (client_addr !== undefined && relay_addr !== undefined) { this.make_proxy_pair(client_addr, relay_addr); } else if (client_addr !== undefined) {

1 0

[flashproxy/js] Add some WebSocket link comments.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 4e206a76b1123aa825089886c9555a94b7ea6356 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:24:37 2012 -0700 Add some WebSocket link comments. --- flashproxy.js | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 94154b1..3b92951 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -34,6 +34,21 @@ * sanity-check minimum of "10K". */ +/* WebSocket links. + * + * The WebSocket Protocol + * https://tools.ietf.org/html/rfc6455 + * + * The WebSocket API + * http://dev.w3.org/html5/websockets/ + * + * MDN page with browser compatibility + * https://developer.mozilla.org/en/WebSockets + * + * Implementation tests (including tests of binary messages) + * http://autobahn.ws/testsuite/reports/clients/index.html + */ + var FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; var DEFAULT_FACILITATOR_ADDR = {

1 0

[flashproxy/js] Semicolon.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 46fa4509b7e13b1938b8263ee14a4a716a43377b Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:26:22 2012 -0700 Semicolon. --- flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 3b92951..9f3fdc6 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -424,7 +424,7 @@ function FlashProxy() this.die = function() { puts("die"); this.badge.set_color("#111"); - } + }; } /* This is the non-functional badge that occupies space when

1 0

[flashproxy/js] Add a ProxyPair.close method.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit aae876084a5d13a928e874e3bac53cec4689d65c Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:40:42 2012 -0700 Add a ProxyPair.close method. --- flashproxy.js | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 9f3fdc6..8c29d82 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -536,6 +536,11 @@ function ProxyPair(client_addr, relay_addr, rate_limit) return ws.readyState == ws.CLOSED; } + this.close = function() { + this.client_s.close(); + this.relay_s.close(); + }; + /* Send as much data as the rate limit currently allows. */ this.flush = function() { var busy;

1 0

[flashproxy/js] Make the number on the badge a cumulative counter.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit a5e7806161544f89f8229516fdb901e87a07fb91 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:42:17 2012 -0700 Make the number on the badge a cumulative counter. It was like this before in swfcat.as. --- flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 02a564f..25f23fb 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -690,7 +690,7 @@ function Badge() } this.refresh = function() { - this.counter_text.innerHTML = escape_html(String(this.num_proxy_pairs)); + this.counter_text.innerHTML = escape_html(String(this.total_proxy_pairs)); }; this.set_color = function(color) {

1 0