- tor-commits - lists.torproject.org

[compass/master] Add new compass logo
by karsten＠torproject.org 09 Sep '12

09 Sep '12

commit b22497f234ca2dd513ea25557432897f98bdb5bb Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 9 20:16:22 2012 +0530 Add new compass logo Thanks to kousik, we have a new logo for compass. --- static/img/compass-logo.jpg | Bin 0 -> 3938 bytes templates/index.html | 4 ++-- templates/result.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/static/img/compass-logo.jpg b/static/img/compass-logo.jpg new file mode 100644 index 0000000..e9d0f60 Binary files /dev/null and b/static/img/compass-logo.jpg differ diff --git a/templates/index.html b/templates/index.html index 3fd3597..e51f6d0 100644 --- a/templates/index.html +++ b/templates/index.html @@ -33,7 +33,7 @@ <span class="icon-bar"></span> </a> <a class="brand" href="{{ - url_for('index') }}">Tor Metrics</a> + url_for('index') }}"><img src="{{ url_for('static', filename='img/compass-logo.jpg') }}" /></a> <div class="nav-collapse"> <ul class="nav"> <li class="active"><a href="{{ @@ -51,7 +51,7 @@ <form class="form-horizontal" action="{{ url_for('result') }}" method=get id="form"> <fieldset> - <legend>Tor Relay Stats</legend> + <legend>Compass</legend> <div class="control-group"> <h3> Filter </h3> <label class="control-label" for="inactive">Inactive</label> diff --git a/templates/result.html b/templates/result.html index 28d4f21..28211e7 100644 --- a/templates/result.html +++ b/templates/result.html @@ -34,7 +34,7 @@ <span class="icon-bar"></span> </a> <a class="brand" href="{{ - url_for('index') }}">Tor Metrics</a> + url_for('index') }}"><img src="{{ url_for('static', filename='img/compass-logo.jpg') }}"></a> <div class="nav-collapse"> <ul class="nav"> <li class="active"><a href="{{

1 0

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

09 Sep '12

commit ee57adb1bd2c31a13b61cbfc5e371d965b866150 Merge: 6a2de26 b22497f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 9 17:37:43 2012 -0400 Merge remote-tracking branch 'gsathya/bug_6639' Conflicts: templates/result.html static/img/compass-logo.jpg | Bin 0 -> 3938 bytes templates/index.html | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --cc templates/index.html index 85fd634,e51f6d0..65a5c6a --- a/templates/index.html +++ b/templates/index.html @@@ -48,10 -48,10 +48,10 @@@ <div class="container"> <div class="hero-unit"> - <form class="form-horizontal" action="{{ url_for('result') }}" + <form class="form-horizontal" action="" method=get id="form"> <fieldset> - <legend>Tor Relay Stats</legend> + <legend>Compass</legend> <div class="control-group"> <h3> Filter </h3> <label class="control-label" for="inactive">Inactive</label>

1 0

[compass/master] Remove abstractions
by karsten＠torproject.org 09 Sep '12

09 Sep '12

commit 1623a83ecc078f3848dc73f6665cefc104975fee Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 9 20:00:01 2012 +0530 Remove abstractions We really don't need abstractions in a dynamically typed language. That said, it'd be nice to throw an error when someone doesn't implement "accept()". --- compass.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/compass.py b/compass.py index 428812f..8b00bf6 100755 --- a/compass.py +++ b/compass.py @@ -13,12 +13,10 @@ import os from optparse import OptionParser, OptionGroup import urllib import re -from abc import abstractmethod class BaseFilter(object): - @abstractmethod def accept(self, relay): - pass + raise NotImplementedError("This isn't implemented by the subclass") def load(self, relays): return filter(self.accept, relays)

1 0

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

09 Sep '12

commit 6a2de26330920f2c87728ae5c1c63a044d2838c5 Merge: 6238c95 1623a83 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 9 17:10:05 2012 -0400 Merge remote-tracking branch 'gsathya/bug_6691' compass.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)

1 0

[compass/master] Show results in /
by karsten＠torproject.org 09 Sep '12

09 Sep '12

commit 528876f5828f93fea3fa9457e099b67e2b36d399 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Wed Aug 29 23:31:18 2012 +0530 Show results in / Convert to a single page app. --- static/js/custom.js | 15 ++++ templates/index.html | 12 ++- templates/result.html | 181 ++++++++++++------------------------------------- 3 files changed, 66 insertions(+), 142 deletions(-) diff --git a/static/js/custom.js b/static/js/custom.js index ee30785..6ede41b 100644 --- a/static/js/custom.js +++ b/static/js/custom.js @@ -24,3 +24,18 @@ function parseArgs(query){ return newQuery; } +function doAjax(){ + var path = window.location.search; + if(path) { + console.log("Sending request"); + $.ajax({ + url: "result"+path, + type: "GET", + }).done(function(data) { + $('#result').append(data); + $('html, body').animate({ + scrollTop: $('#result').offset().top + }, 1000); + }); + } +} diff --git a/templates/index.html b/templates/index.html index 3fd3597..bdb4421 100644 --- a/templates/index.html +++ b/templates/index.html @@ -48,7 +48,7 @@ <div class="container"> <div class="hero-unit"> - <form class="form-horizontal" action="{{ url_for('result') }}" + <form class="form-horizontal" action="" method=get id="form"> <fieldset> <legend>Tor Relay Stats</legend> @@ -146,6 +146,8 @@ <hr> + <div id="result"></div> + <footer> The Tor Project - 2012<br> <a href="https://gitweb.torproject.org/compass.git">Source code</a> - @@ -163,18 +165,20 @@ <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script> <script src="{{ url_for('static', filename='js/custom.js') }}"></script> <script> - var myForm = document.getElementById('form'); + doAjax(); + var myForm = document.getElementById('form'); myForm.onsubmit = function() { var allInputs = myForm.getElementsByTagName('input'); var input, i; - for(i = 0; input = allInputs[i]; i++) { if(input.getAttribute('name') && !input.value) { input.setAttribute('name', ''); } } }; - </script> + + + </script> </body> </html> diff --git a/templates/result.html b/templates/result.html index 28d4f21..190e8fc 100644 --- a/templates/result.html +++ b/templates/result.html @@ -1,138 +1,43 @@ - -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <title>Tor Metrics</title> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta name="description" content="Tor relay stats"> - <meta name="author" content="Sathyanarayanan Gunasekaran"> - -  - <link href="{{ url_for('static', filename='css/bootstrap.css') }}" rel="stylesheet"> - <style type="text/css"> - body { - padding-top: 60px; - padding-bottom: 40px; - } - </style> - -  -  - </head> - - <body> - - <div class="navbar navbar-fixed-top"> - <div class="navbar-inner"> - <div class="container"> - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </a> - <a class="brand" href="{{ - url_for('index') }}">Tor Metrics</a> - <div class="nav-collapse"> - <ul class="nav"> - <li class="active"><a href="{{ - url_for('index') }}">Home</a></li> - <li><a href="https://trac.torproject.org/projects/tor/ticket/6498">Trac - Ticket #6498</a></li> - </ul> - </div> - </div> - </div> - </div> - - <div class="container"> - <div class="hero-unit"> - <table class="table table-striped table-condensed table-hover table-bordered"> - <thead> - <tr> - <th>#</th> - <th><span rel="tooltip" title="Relative bandwidth weight assigned to this relay by the directory authorities">Consensus Weights</span></th> - <th><span rel="tooltip" title="Relative advertised bandwidth of this relay compared to the total advertised bandwidth in the network">Advertised Bandwidth</span></th> - <th><span rel="tooltip" title=" Probability of this relay to be selected for the guard position">Guard Probability</span></th> - <th><span rel="tooltip" title="Probability of this relay to be selected for the middle position">Middle Probability</span></th> - <th><span rel="tooltip" title="Probability of this relay to be selected for the exit position">Exit Probability</span></th> - <th>Nickname</th> - <th>Fingerprint</th> - <th>Exit</th> - <th>Guard</th> - <th>Country</th> - <th>Autonomous System</th> - </tr> - </thead> - <tbody> - {% for result in results %} - <tr> - <td>{{ loop.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 %} - <td>{{ result.fp }}</td> - {% else %} - <td><a href="https://atlas.torproject.org/#details/{{ - result.fp }}">{{ result.fp[:8] }}</a></td> - {% endif %} - <td>{{ result.exit }}</td> - <td>{{ result.guard }}</td> - <td>{{ result.cc }}</td> - <td>{{ result.as_info }}</td> - </tr> - {% endfor %} - </tbody> - </table> - <p><a class="btn btn-primary btn-large" href="{{ - url_for('index') }}">Back «</a></p> - </div> - - <hr> - - <footer> - The Tor Project - 2012<br> - <a href="https://gitweb.torproject.org/compass.git">Source code</a> - - <a href="https://trac.torproject.org/projects/tor/newticket?component=Compass">Report a bug</a> - - <a href="mailto:tor-assistants@lists.torproject.org">Contact</a> - </footer> - - </div>  - -  -  - - <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/custom.js') }}"></script> - <script src="{{ url_for('static', filename='js/bootstrap-tooltip.js') }}"></script> - - <script> - $(document).ready(function() { - addListener(); - $('span[rel=tooltip]').tooltip(); - }); - </script> -  - </body> -</html> +<div class="hero-unit"> + <table class="table table-striped table-condensed table-hover table-bordered"> + <thead> + <tr> + <th>#</th> + <th><span rel="tooltip" title="Relative bandwidth weight assigned to this relay by the directory authorities">Consensus Weights</span></th> + <th><span rel="tooltip" title="Relative advertised bandwidth of this relay compared to the total advertised bandwidth in the network">Advertised Bandwidth</span></th> + <th><span rel="tooltip" title=" Probability of this relay to be selected for the guard position">Guard Probability</span></th> + <th><span rel="tooltip" title="Probability of this relay to be selected for the middle position">Middle Probability</span></th> + <th><span rel="tooltip" title="Probability of this relay to be selected for the exit position">Exit Probability</span></th> + <th>Nickname</th> + <th>Fingerprint</th> + <th>Exit</th> + <th>Guard</th> + <th>Country</th> + <th>Autonomous System</th> + </tr> + </thead> + <tbody> + {% for result in results %} + <tr> + <td>{{ loop.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 %} + <td>{{ result.fp }}</td> + {% else %} + <td><a href="https://atlas.torproject.org/#details/{{ result.fp }}">{{ result.fp[:8] }}</a></td> + {% endif %} + <td>{{ result.exit }}</td> + <td>{{ result.guard }}</td> + <td>{{ result.cc }}</td> + <td>{{ result.as_info }}</td> + </tr> + {% endfor %} + </tbody> + </table> +</div>

1 0

[compass/master] Set options based on request args
by karsten＠torproject.org 09 Sep '12

09 Sep '12

commit 6238c95aa80a6f1a109a64a0ada093976d1e834e Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Fri Aug 31 10:45:24 2012 +0530 Set options based on request args --- static/js/custom.js | 54 +++++++++++++++++++++++++++++++++++++------------- templates/index.html | 37 ++++++++++++---------------------- 2 files changed, 53 insertions(+), 38 deletions(-) diff --git a/static/js/custom.js b/static/js/custom.js index 6ede41b..6ef85be 100644 --- a/static/js/custom.js +++ b/static/js/custom.js @@ -10,24 +10,10 @@ function addListener(){ }); } -function parseArgs(query){ - var newQuery = {}, key, value; - query = String(query); - query = query.split("?")[1]; - query = query.split("&"); - $.each(query, function(i, arg){ - arg = arg.split("="); - if (arg[0] != "sort") { - newQuery[arg[0]] = arg[1]; - } - }); - return newQuery; -} function doAjax(){ var path = window.location.search; if(path) { - console.log("Sending request"); $.ajax({ url: "result"+path, type: "GET", @@ -39,3 +25,43 @@ function doAjax(){ }); } } + +function filterArgs() { + var myForm = document.getElementById('form'); + var allInputs = myForm.getElementsByTagName('input'); + var input, i; + for(i = 0; input = allInputs[i]; i++) { + if(input.getAttribute('name') && !input.value) { + input.setAttribute('name', ''); + } + } +} + +function parseArgs(query){ + var newQuery = {}, key, value; + query = String(query); + query = query.split("?")[1]; + query = query.split("&"); + $.each(query, function(i, arg){ + arg = arg.split("="); + newQuery[arg[0]] = arg[1]; + }); + return newQuery; +} + +function setOptions(){ + var path = window.location.search; + if (path) { + var args = parseArgs(path); + $.each(args, function (arg, value) { + type = ($('input.'+arg).attr("type") || $('input#'+arg).attr("type")); + if (type == "checkbox" || type == "radio") { + $('input.'+arg).val([value]); + $('input#'+arg).val([value]); + } else if( type == "text") { + $('input.'+arg).val(value); + $('input#'+arg).val(value); + } + }); + } +} diff --git a/templates/index.html b/templates/index.html index bdb4421..85fd634 100644 --- a/templates/index.html +++ b/templates/index.html @@ -63,14 +63,14 @@ <label class="control-label" for="guards">Guards</label> <div class="controls"> <label class="checkbox"> - <input type="checkbox" id="guards" value="True" name="guards_only"> + <input type="checkbox" id="guards_only" value="True" name="guards_only"> select only relays suitable for guard position </label> </div> - <label class="control-label" for="exit">Exits</label> + <label class="control-label" for="exits_only">Exits</label> <div class="controls"> <label class="checkbox"> - <input type="checkbox" id="exit" value="True" name="exits_only"> + <input type="checkbox" id="exits_only" value="True" name="exits_only"> select only relays suitable for exit position</label> </div> <label class="control-label" for="family">Family</label> @@ -81,13 +81,13 @@ </div> <label class="control-label" for="asNo">AS Number</label> <div class="controls"> - <input type="text" class="input-xlarge" id="asNo" name="ases" + <input type="text" class="input-xlarge" id="ases" name="ases" placeholder="AS39138"> <span class="help-inline">select only relays from AS number</span> </div> <label class="control-label" for="cc">Country Code</label> <div class="controls"> - <input type="text" class="input-xlarge" id="cc" name="country" + <input type="text" class="input-xlarge" id="country" name="country" placeholder="de"> <span class="help-inline">select only relays from country with code</span> </div> @@ -95,20 +95,20 @@ <label class="control-label" for="exits">Exits</label> <div class="controls"> <label class="radio"> - <input type="radio" name="exits" id="all_relays" value="all_relays" checked> + <input type="radio" class="exits" name="exits" id="all_relays" value="all_relays" checked> All relays </label> <label class="radio"> - <input type="radio" name="exits" id="exits_only" value="fast_exits_only"> + <input type="radio" class="exits" name="exits" id="fast_exits_only" value="fast_exits_only"> Fast exit relays (95+ Mbit/s, 5000+ KB/s, 80/443/554/1755, 2 relays per /24) </label> <label class="radio"> - <input type="radio" name="exits" id="almost_fast_relays" value="almost_fast_exits_only"> + <input type="radio" class="exits" name="exits" id="almost_fast_exits_only" value="almost_fast_exits_only"> Almost fast exit relays (80+ Mbit/s, 2000+ KB/s, 80/443, not in set of fast exits) </label> <label class="radio"> - <input type="radio" name="exits" id="exit_relays_any_nw" value="fast_exits_only_any_network"> + <input type="radio" class="exits" name="exits" id="fast_exits_only_any_network" value="fast_exits_only_any_network"> Fast exits relays any network (95+ Mbit/s, 5000+ KB/s, 80/443/554/1755) </label> </div> @@ -117,12 +117,12 @@ <label class="control-label" for="country">Country</label> <div class="controls"> <label class="checkbox"> - <input type="checkbox" id="country" value="True" name="by_country"> + <input type="checkbox" id="by_country" value="True" name="by_country"> group relays by country </label> </div> <label class="control-label" for="as">AS</label> <div class="controls"> - <input type="checkbox" id="as" value="True" name="by_as"> + <input type="checkbox" id="by_as" value="True" name="by_as"> group relays by AS </label> </div> </div> @@ -165,20 +165,9 @@ <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script> <script src="{{ url_for('static', filename='js/custom.js') }}"></script> <script> + filterArgs(); doAjax(); - var myForm = document.getElementById('form'); - - myForm.onsubmit = function() { - var allInputs = myForm.getElementsByTagName('input'); - var input, i; - for(i = 0; input = allInputs[i]; i++) { - if(input.getAttribute('name') && !input.value) { - input.setAttribute('name', ''); - } - } - }; - - + setOptions(); </script> </body> </html>

1 0

[tor/master] finish backing out 5492de76
by arma＠torproject.org 09 Sep '12

09 Sep '12

commit f6639d5676f34234afaec9b49c89735724f7f67e Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 9 16:51:34 2012 -0400 finish backing out 5492de76 --- src/or/connection.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 7a39e5e..d8f5d87 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2038,9 +2038,9 @@ connection_mark_all_noncontrol_connections(void) /** Return 1 if we should apply rate limiting to <b>conn</b>, and 0 * otherwise. * Right now this just checks if it's an internal IP address or an - * internal connection. We also check if the connection uses pluggable - * transports, since we should then limit it even if it comes from an - * internal IP address. */ + * internal connection. We also should, but don't, check if the connection + * uses pluggable transports, since we should then limit it even if it + * comes from an internal IP address. */ static int connection_is_rate_limited(connection_t *conn) {

1 0

[tor/master] minor logging improvement
by arma＠torproject.org 09 Sep '12

09 Sep '12

commit 67abdcd8d9870c05f5f7da05075b2375aa48ef04 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 9 15:54:59 2012 -0400 minor logging improvement --- src/or/routerlist.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 3aea606..b3167c5 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4965,7 +4965,8 @@ count_usable_descriptors(int *num_present, int *num_usable, } SMARTLIST_FOREACH_END(rs); - log_debug(LD_DIR, "%d usable, %d present.", *num_usable, *num_present); + log_debug(LD_DIR, "%d usable, %d present (%s).", *num_usable, *num_present, + md ? "microdescs" : "descs"); } /** We just fetched a new set of descriptors. Compute how far through

1 0

[onionoo/master] Handle bridges without any flags.
by karsten＠torproject.org 09 Sep '12

09 Sep '12

commit f644623da84c5a4f851924a6b12916e6e0bbe4ea Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 9 10:43:55 2012 -0400 Handle bridges without any flags. --- src/org/torproject/onionoo/CurrentNodes.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index a34cbb7..252abbe 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java +++ b/src/org/torproject/onionoo/CurrentNodes.java @@ -174,11 +174,11 @@ public class CurrentNodes { entry.getLastSeenMillis()); String orPort = String.valueOf(entry.getOrPort()); String dirPort = String.valueOf(entry.getDirPort()); - StringBuilder sb = new StringBuilder(); + StringBuilder flagsBuilder = new StringBuilder(); + written = 0; for (String relayFlag : entry.getRelayFlags()) { - sb.append("," + relayFlag); + flagsBuilder.append((written++ > 0 ? "," : "") + relayFlag); } - String relayFlags = sb.toString().substring(1); String consensusWeight = String.valueOf( entry.getConsensusWeight()); String countryCode = entry.getCountryCode() != null @@ -192,7 +192,7 @@ public class CurrentNodes { ? entry.getPortList() : "null"; bw.write("r " + nickname + " " + fingerprint + " " + addressesBuilder.toString() + " " + validAfter + " " - + orPort + " " + dirPort + " " + relayFlags + " " + + orPort + " " + dirPort + " " + flagsBuilder.toString() + " " + consensusWeight + " " + countryCode + " " + hostName + " " + String.valueOf(lastRdnsLookup) + " " + defaultPolicy + " " + portList + "\n"); @@ -213,15 +213,15 @@ public class CurrentNodes { addressesBuilder.append(";"); String orPort = String.valueOf(entry.getOrPort()); String dirPort = String.valueOf(entry.getDirPort()); - StringBuilder sb = new StringBuilder(); + StringBuilder flagsBuilder = new StringBuilder(); + written = 0; for (String relayFlag : entry.getRelayFlags()) { - sb.append("," + relayFlag); + flagsBuilder.append((written++ > 0 ? "," : "") + relayFlag); } - String relayFlags = sb.toString().substring(1); bw.write("b " + nickname + " " + fingerprint + " " + addressesBuilder.toString() + " " + published + " " + orPort - + " " + dirPort + " " + relayFlags + " -1 ?? null -1 null " - + "null\n"); + + " " + dirPort + " " + flagsBuilder.toString() + + " -1 ?? null -1 null null\n"); } bw.close(); } catch (IOException e) {

1 0

[torbrowser/maint-2.3] bump torbutton to 1.4.6.1
by erinn＠torproject.org 09 Sep '12

09 Sep '12

commit b079c16ab85bb4a2986cd0eb7084e403a1a43113 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Sep 9 11:30:43 2012 +0100 bump torbutton to 1.4.6.1 --- build-scripts/versions-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index d6418cb..95cfc77 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -13,7 +13,7 @@ PIDGIN_VER=2.6.4 FIREFOX_VER=15.0.1 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 -TORBUTTON_VER=1.4.6 +TORBUTTON_VER=1.4.6.1 NOSCRIPT_VER=2.5.4 HTTPSEVERYWHERE_VER=3.0development.6 OBFSPROXY_VER=0.1.4

1 0