May 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.0] Fix crash when starting with LearnCircuitBuildTimeout 0.
by nickm＠torproject.org 18 May '17

18 May '17

commit 2ba58f275cef6ae70c0d6f5a94f8bd3ff99f1e5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 16 11:20:12 2017 -0400 Fix crash when starting with LearnCircuitBuildTimeout 0. Before we've set our options, we can neither call get_options() nor networkstatus_get_latest_consensus(). Fixes bug 22252; bugfix on 4d9d2553baa6856b1d85ec26baa1ac3d2c24832a in 0.2.9.3-alpha. --- changes/bug22252 | 3 +++ src/or/circuitstats.c | 12 ++++++++++-- src/or/circuitstats.h | 3 +++ src/or/config.c | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/changes/bug22252 b/changes/bug22252 new file mode 100644 index 0000000..42b9d8e --- /dev/null +++ b/changes/bug22252 @@ -0,0 +1,3 @@ + o Minor bugfixes (configuration): + - Do not crash when starting with LearnCircuitBuildTimeout 0. + Fixes bug 22252; bugfix on 0.2.9.3-alpha. diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 418acc0..d4487cf 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -107,11 +107,19 @@ get_circuit_build_timeout_ms(void) int circuit_build_times_disabled(void) { + return circuit_build_times_disabled_(get_options()); +} + +/** As circuit_build_times_disabled, but take options as an argument. */ +int +circuit_build_times_disabled_(const or_options_t *options, + int ignore_consensus) +{ if (unit_tests) { return 0; } else { - const or_options_t *options = get_options(); - int consensus_disabled = networkstatus_get_param(NULL, "cbtdisabled", + int consensus_disabled = + ignore_consensus ? 0 : networkstatus_get_param(NULL, "cbtdisabled", 0, 0, 1); int config_disabled = !options->LearnCircuitBuildTimeout; int dirauth_disabled = options->AuthoritativeDir; diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h index 72b1609..38a994d 100644 --- a/src/or/circuitstats.h +++ b/src/or/circuitstats.h @@ -18,6 +18,9 @@ double get_circuit_build_close_time_ms(void); double get_circuit_build_timeout_ms(void); int circuit_build_times_disabled(void); +int circuit_build_times_disabled_(const or_options_t *options, + int ignore_consensus); + int circuit_build_times_enough_to_compute(const circuit_build_times_t *cbt); void circuit_build_times_update_state(const circuit_build_times_t *cbt, or_state_t *state); diff --git a/src/or/config.c b/src/or/config.c index 3693cdf..dd9f4eb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3450,7 +3450,7 @@ options_validate(or_options_t *old_options, or_options_t *options, int severity = LOG_NOTICE; /* Be a little quieter if we've deliberately disabled * LearnCircuitBuildTimeout. */ - if (circuit_build_times_disabled()) { + if (circuit_build_times_disabled_(options, 1)) { severity = LOG_INFO; } log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but "

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 18 May '17

18 May '17

commit b214c2c0955373bdf0eab6954c19dd9b559200cf Merge: e04da28 935cd77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 18 10:06:27 2017 -0400 Merge branch 'maint-0.3.0' changes/bug22252 | 3 +++ src/or/circuitstats.c | 11 ++++++++++- src/or/circuitstats.h | 3 +++ src/or/config.c | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 18 May '17

18 May '17

commit bd62f78ebd10f975522e6a36fcef3f4f6c488440 Merge: 4663bec 935cd77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 18 10:06:19 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22252 | 3 +++ src/or/circuitstats.c | 11 ++++++++++- src/or/circuitstats.h | 3 +++ src/or/config.c | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-)

1 0

[torspec/master] Mark proposals 121 and 155 as closed.
by nickm＠torproject.org 18 May '17

18 May '17

commit 65fc15c92779cce42c64322bede7a68b74a1d702 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 18 09:55:34 2017 -0400 Mark proposals 121 and 155 as closed. According to Karsten, 121 has long been merged into rend-spec.txt, and 155 is implementation-specific stuff that doesn't affect the protocol itself. --- proposals/000-index.txt | 8 ++++---- proposals/121-hidden-service-authentication.txt | 2 +- proposals/155-four-hidden-service-improvements.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 405b4ff..62d6414 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -41,7 +41,7 @@ Proposals by number: 118 Advertising multiple ORPorts at once [SUPERSEDED] 119 New PROTOCOLINFO command for controllers [CLOSED] 120 Shutdown descriptors when Tor servers stop [DEAD] -121 Hidden Service Authentication [FINISHED] +121 Hidden Service Authentication [CLOSED] 122 Network status entries need a new Unnamed flag [CLOSED] 123 Naming authorities automatically create bindings [CLOSED] 124 Blocking resistant TLS certificate usage [SUPERSEDED] @@ -75,7 +75,7 @@ Proposals by number: 152 Optionally allow exit from single-hop circuits [CLOSED] 153 Automatic software update protocol [SUPERSEDED] 154 Automatic Software Update Protocol [SUPERSEDED] -155 Four Improvements of Hidden Service Performance [FINISHED] +155 Four Improvements of Hidden Service Performance [CLOSED] 156 Tracking blocked ports on the client side [SUPERSEDED] 157 Make certificate downloads specific [CLOSED] 158 Clients download consensus + microdescriptors [FINISHED] @@ -267,9 +267,7 @@ Proposals by status: 099 Miscellaneous proposals 257 Refactoring authorities and making them more isolated from the net FINISHED: - 121 Hidden Service Authentication [in 0.2.1.x] 151 Improving Tor Path Selection [in 0.2.2.2-alpha] - 155 Four Improvements of Hidden Service Performance [in 0.2.1.x] 158 Clients download consensus + microdescriptors [in 0.2.3.1-alpha] 160 Authorities vote for bandwidth offsets in consensus [for 0.2.1.x] 161 Computing Bandwidth Adjustments [for 0.2.1.x] @@ -296,6 +294,7 @@ Proposals by status: 114 Distributed Storage for Tor Hidden Service Descriptors [in 0.2.0.x] 117 IPv6 exits [for 0.2.4.x] [in 0.2.4.7-alpha] 119 New PROTOCOLINFO command for controllers [in 0.2.0.x] + 121 Hidden Service Authentication [in 0.2.1.x] 122 Network status entries need a new Unnamed flag [in 0.2.0.x] 123 Naming authorities automatically create bindings [in 0.2.0.x] 125 Behavior for bridge users, bridge relays, and bridge authorities [in 0.2.0.x] @@ -311,6 +310,7 @@ Proposals by status: 148 Stream end reasons from the client side should be uniform [in 0.2.1.9-alpha] 150 Exclude Exit Nodes from a circuit [in 0.2.1.3-alpha] 152 Optionally allow exit from single-hop circuits [in 0.2.1.6-alpha] + 155 Four Improvements of Hidden Service Performance [in 0.2.1.x] 157 Make certificate downloads specific [for 0.2.4.x] 166 Including Network Statistics in Extra-Info Documents [for 0.2.2] 167 Vote on network parameters in consensus [in 0.2.2] diff --git a/proposals/121-hidden-service-authentication.txt b/proposals/121-hidden-service-authentication.txt index 0d92b53..8dd59e9 100644 --- a/proposals/121-hidden-service-authentication.txt +++ b/proposals/121-hidden-service-authentication.txt @@ -3,7 +3,7 @@ Title: Hidden Service Authentication Author: Tobias Kamm, Thomas Lauterbach, Karsten Loesing, Ferdinand Rieger, Christoph Weingarten Created: 10-Sep-2007 -Status: Finished +Status: Closed Implemented-In: 0.2.1.x Change history: diff --git a/proposals/155-four-hidden-service-improvements.txt b/proposals/155-four-hidden-service-improvements.txt index e342bf1..423c9e8 100644 --- a/proposals/155-four-hidden-service-improvements.txt +++ b/proposals/155-four-hidden-service-improvements.txt @@ -2,7 +2,7 @@ Filename: 155-four-hidden-service-improvements.txt Title: Four Improvements of Hidden Service Performance Author: Karsten Loesing, Christian Wilms Created: 25-Sep-2008 -Status: Finished +Status: Closed Implemented-In: 0.2.1.x Change history:

1 0

[tor/master] Fixed error on BASEXX_NOPAD LEN and BUFSIZE macros #21872
by nickm＠torproject.org 18 May '17

18 May '17

commit e04da2828d6bbf1499d3df5ba85a8baf4c485bb7 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Wed May 17 00:22:11 2017 +0100 Fixed error on BASEXX_NOPAD LEN and BUFSIZE macros #21872 --- src/common/util_format.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/util_format.h b/src/common/util_format.h index adf48c0..4af8832 100644 --- a/src/common/util_format.h +++ b/src/common/util_format.h @@ -23,11 +23,11 @@ #define BASE32_BUFSIZE(n) (BASE32_LEN(n) + 1) #define BASE16_BUFSIZE(n) (BASE16_LEN(n) + 1) -#define BASE64_NOPAD_LEN(n) (CEIL_DIV((n) * 4, 3) -#define BASE32_NOPAD_LEN(n) (CEIL_DIV((n) * 8, 5) +#define BASE64_NOPAD_LEN(n) (CEIL_DIV((n) * 4, 3)) +#define BASE32_NOPAD_LEN(n) (CEIL_DIV((n) * 8, 5)) -#define BASE64_NOPAD_BUFSIZE(n) (BASE64_NOPAD_LEN(n) + 1)) -#define BASE32_NOPAD_BUFSIZE(n) (BASE32_NOPAD_LEN(n) + 1)) +#define BASE64_NOPAD_BUFSIZE(n) (BASE64_NOPAD_LEN(n) + 1) +#define BASE32_NOPAD_BUFSIZE(n) (BASE32_NOPAD_LEN(n) + 1) /** @} */ #define BASE64_ENCODE_MULTILINE 1

1 0

[webwml/master] Deprecate old Tor Browser version: 7.0a3
by boklm＠torproject.org 18 May '17

18 May '17

commit 0f01c76ad4a3d5aa6ed52edf94a5b6c6a4cbcdd3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu May 18 12:15:26 2017 +0200 Deprecate old Tor Browser version: 7.0a3 --- projects/torbrowser/RecommendedTBBVersions | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 1c6b754..33c69e5 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,10 +3,6 @@ "6.5.2-Linux", "6.5.2-MacOS", "6.5.2-Windows", -"7.0a3", -"7.0a3-Linux", -"7.0a3-MacOS", -"7.0a3-Windows", "7.0a4", "7.0a4-Linux", "7.0a4-MacOS",

1 0

[atlas/master] Fix the styling of the graph sections
by irl＠torproject.org 18 May '17

18 May '17

commit 6aebf7385063b79b20401d5ca648c1eafd152ff4 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri May 12 14:09:51 2017 +0000 Fix the styling of the graph sections The graph sections used incorrect spacing because of missing column specifications. Part of #22239. --- templates/details/bridge.html | 40 +++------------------------------------- templates/details/router.html | 42 +++--------------------------------------- 2 files changed, 6 insertions(+), 76 deletions(-) diff --git a/templates/details/bridge.html b/templates/details/bridge.html index fda73f6..a34701b 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -91,6 +91,7 @@ </div> <div class="row"> + <div class="span12"> <ul class="thumbnails"> <li> <div class="thumbnail"> @@ -103,10 +104,6 @@ </div> </div> </li> - </ul> -</div><div class="row"> - - <ul class="thumbnails"> <li> <div class="thumbnail"> @@ -119,11 +116,6 @@ </div> </div> </li> - </ul> -</div> - -<div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="bw_year" class="graph"> @@ -135,10 +127,6 @@ </div> </div> </li> - - </ul> -</div><div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="bw_years" class="graph"> @@ -152,7 +140,9 @@ </div> </li> </ul> + </div> </div><div class="row"> + <div class="span12"> <ul class="thumbnails"> <li> <div class="thumbnail"> @@ -166,11 +156,6 @@ </div> </div> </li> - </ul> -</div> - -<div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="clients_month" class="graph"> @@ -182,10 +167,6 @@ </div> </div> </li> - </ul> -</div><div class="row"> - - <ul class="thumbnails"> <li> <div class="thumbnail"> @@ -198,11 +179,6 @@ </div> </div> </li> - </ul> -</div> - -<div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="clients_year" class="graph"> @@ -214,10 +190,6 @@ </div> </div> </li> - - </ul> -</div><div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="clients_years" class="graph"> @@ -232,10 +204,4 @@ </li> </ul> </div> - - diff --git a/templates/details/router.html b/templates/details/router.html index e72dbd9..46f935f 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -145,6 +145,7 @@ </div> <div class="row"> + <div class="span12"> <ul class="thumbnails"> <li> <div class="thumbnail"> @@ -157,10 +158,6 @@ </div> </div> </li> - </ul> -</div><div class="row"> - - <ul class="thumbnails"> <li> <div class="thumbnail"> @@ -173,11 +170,6 @@ </div> </div> </li> - </ul> -</div> - -<div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="bw_year" class="graph"> @@ -189,10 +181,6 @@ </div> </div> </li> - - </ul> -</div><div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="bw_years" class="graph"> @@ -207,8 +195,10 @@ </li> </ul> </div> +</div> <div class="row"> + <div class="span12"> <ul class="thumbnails"> <li> <div class="thumbnail"> @@ -222,11 +212,6 @@ </div> </div> </li> - </ul> -</div> - -<div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="weights_month" class="graph"> @@ -239,11 +224,6 @@ </div> </div> </li> - </ul> -</div> - -<div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="weights_months" class="graph"> @@ -256,11 +236,6 @@ </div> </div> </li> - </ul> -</div> - -<div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="weights_year" class="graph"> @@ -273,11 +248,6 @@ </div> </div> </li> - </ul> -</div> - -<div class="row"> - <ul class="thumbnails"> <li> <div class="thumbnail"> <div id="weights_years" class="graph"> @@ -292,10 +262,4 @@ </li> </ul> </div> - -

1 0

[atlas/master] Remove logging to the console
by irl＠torproject.org 18 May '17

18 May '17

commit 38631e5bf458c4c6521d1d1e958062d09cb3c4af Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue May 16 09:09:55 2017 +0000 Remove logging to the console Closes #22272. --- js/collections/results.js | 13 ----------- js/libs/datatables/dataTables.TorStatus.js | 2 -- js/models/graph.js | 2 -- js/models/relay.js | 11 +++------ js/router.js | 1 - js/views/details/main.js | 2 -- js/views/search/do.js | 36 ++---------------------------- 7 files changed, 5 insertions(+), 62 deletions(-) diff --git a/js/collections/results.js b/js/collections/results.js index 13cf7ac..c341321 100644 --- a/js/collections/results.js +++ b/js/collections/results.js @@ -20,7 +20,6 @@ define([ this.valid_after = response.valid_after; var relays = []; options.error = function(options) { - console.log('error..'); error(options.error, collection, options); } _.each(response.relays, function(relay, resultsC) { @@ -35,12 +34,10 @@ define([ }); if (relays.length == 0) { error(0); - console.log('Empty result set was returned'); return false; } else if (relays.length > 50) { relays = relays.slice(0, 50); err = 4; - console.log(options); } var lookedUpRelays = 0; _.each(relays, function(relay) { @@ -56,7 +53,6 @@ define([ lookedUp(); }, error: function() { - console.log("error in loading one relay.."); lookedUp(); error(0); } @@ -64,20 +60,11 @@ define([ }); }).error( function(jqXHR, textStatus, errorThrown) { - console.log(jqXHR); if(jqXHR.statusText == "error") { error(2); } else { error(3); } - /* - console.log("jqXHR: " + - jqXHR + " textStauts: " + - textStatus + " errorThrown: " + - errorThrown); - console.log("error in doing query.."); - error(2) - */ } ); } diff --git a/js/libs/datatables/dataTables.TorStatus.js b/js/libs/datatables/dataTables.TorStatus.js index 19b0ee0..b5319ed 100644 --- a/js/libs/datatables/dataTables.TorStatus.js +++ b/js/libs/datatables/dataTables.TorStatus.js @@ -13,8 +13,6 @@ $.fn.dataTableExt.afnFiltering.push( function( oSettings, aData, iDataIndex ) { var iMin = document.getElementById('bw_from').value * 1; var iMax = document.getElementById('bw_from').value * 1; - console.log("iMin: "+iMin+" iMax: "+iMax); - console.log(aData); var iVersion = aData[3] == "-" ? 0 : aData[3]*1; if ( iMin == "" && iMax == "" ) diff --git a/js/models/graph.js b/js/models/graph.js index 1f356db..668fc6d 100644 --- a/js/models/graph.js +++ b/js/models/graph.js @@ -12,8 +12,6 @@ define([ var first = history[period].first.split(' '); var date = first[0].split('-'); var time = first[1].split(':'); - //console.log(date); - //console.log(time); first = new Date(date[0], date[1]-1, date[2], time[0], time[1], time[2]); var y = first.getTime(); diff --git a/js/models/relay.js b/js/models/relay.js index d53eb81..1cd4f74 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -75,10 +75,6 @@ define([ secs = secs % 60; mins = mins % 60; hours = hours % 24; - // console.log("secs: "+secs); - // console.log("mins: "+mins); - // console.log("hours: "+hours); - // console.log("days: "+days); var hr_date = ""; var hr_date_full = ""; var hr = 0; @@ -135,7 +131,6 @@ define([ var success = options.success; var error = options.error; var model = this; - console.log("doing query.."); var xhr = $.getJSON(this.baseurl+'/details?lookup='+this.fingerprint, function(data) { checkIfDataIsUpToDate(xhr.getResponseHeader("Last-Modified")); var relay = null; @@ -147,7 +142,6 @@ define([ relay.is_bridge = true; } if (relay) { - //console.log(data); relay.contact = relay.contact ? relay.contact : 'undefined'; relay.platform = relay.platform ? relay.platform : null; relay.recommended_version = (typeof relay.recommended_version !== 'undefined') ? relay.recommended_version : null; @@ -180,7 +174,6 @@ define([ relay.uptime = relay.last_restarted ? model.parsedate(relay.last_restarted) : null; relay.uptime_hr = relay.last_restarted ? relay.uptime.hr : null; relay.uptime_hrfull = relay.last_restarted ? relay.uptime.hrfull : null; - //console.log(relay.uptime.hrfull); relay.uptime = relay.last_restarted ? relay.uptime.millisecs : null; relay.last_restarted = relay.last_restarted ? relay.last_restarted : null; relay.last_seen = relay.last_seen ? relay.last_seen : null; @@ -197,7 +190,9 @@ define([ } else { error(model) } - }).error(function() {console.log("error...");error();}); + }).error(function() { + error(); + }); } }); diff --git a/js/router.js b/js/router.js index 5219c23..769fca9 100644 --- a/js/router.js +++ b/js/router.js @@ -156,7 +156,6 @@ define([ $("#nav-search").submit(function(e){ var query = _.escape($(this).children("input.search-query").val()); query = query.trim(); - console.log(query); $("#suggestion").hide(); document.location = "#search/"+query; return false; diff --git a/js/views/details/main.js b/js/views/details/main.js index 5605c0c..d47899d 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -20,7 +20,6 @@ define([ initialize: function() { this.model = new relayModel; this.graph = new graphModel; - //console.log(this.graph); }, plot: function(g, data, labels, legendPos, colors, tickFormat, tooltipFormat) { @@ -173,7 +172,6 @@ define([ }, render: function() { var data = {relay: this.model}; - //console.log(data); var compiledTemplate; if (!this.model) compiledTemplate = _.template(errorDetailsTemplate, data); diff --git a/js/views/search/do.js b/js/views/search/do.js index 8bc38b8..74f38f0 100644 --- a/js/views/search/do.js +++ b/js/views/search/do.js @@ -22,10 +22,6 @@ define([ var iMax = document.getElementById(data.idb).value; if ( iMin == "" && iMax == "") { - //console.log("True!") - //console.log("RAW: "+rawdata); - //console.log("iMin: "+iMin+" iMax: "+iMax); - //console.log("datafilter:"+datafilter); return true; } else { var rawdata = $(data.aData[data.i]).attr('data-filter'); @@ -33,28 +29,12 @@ define([ } if ( iMin == "" && datafilter < iMax*1) { - //console.log("True!") - //console.log("RAW: "+rawdata); - //console.log("iMin: "+iMin+" iMax: "+iMax); - //console.log("datafilter:"+datafilter); return true; } else if (iMin*1 <= datafilter && "" == iMax) { - //console.log("True!") - //console.log("RAW: "+rawdata); - //console.log("iMin: "+iMin+" iMax: "+iMax); - //console.log("datafilter:"+datafilter); return true; } else if (iMin*1 <= datafilter && datafilter <= iMax*1) { - //console.log("True!") - //console.log("RAW: "+rawdata); - //console.log("iMin: "+iMin+" iMax: "+iMax); - //console.log("datafilter:"+datafilter); return true; } - //console.log("FALSE!") - //console.log("RAW: "+rawdata); - //console.log("iMin: "+iMin+" iMax: "+iMax); - //console.log("datafilter:"+datafilter); return false; @@ -62,12 +42,7 @@ define([ var imagefilter = function(data) { var name = document.getElementById(data.id).value; var result = false; - //console.log(name); if ( name == "" ) { - //console.log("True!") - //console.log("RAW: "+rawdata); - //console.log("iMin: "+iMin+" iMax: "+iMax); - //console.log("datafilter:"+datafilter); return true; } else { var elements = $(data.aData[data.i]); @@ -75,12 +50,9 @@ define([ _.each(elements, function(el) { var datafilter = $(el).attr('title'); if (datafilter != undefined) { - //console.log("Datafilter: "+datafilter); var fRegex = new RegExp(datafilter); if (name.match(fRegex)) { - console.log("fRegex: "+fRegex); - console.log("name: "+name); result |= true; } else { result |= false; @@ -88,8 +60,7 @@ define([ } }); - if (result == 1) { console.log('TRUE');return true; } - else { console.log("FALSE");return false; } + return (result == 1); } $.fn.dataTableExt.afnFiltering.push( @@ -112,7 +83,6 @@ define([ idb: "uptime_to", i: 2, transform: function(data) { - console.log(data); return Math.floor(data/1000/3600/24); } }); @@ -129,9 +99,7 @@ define([ i: 5 }); - //console.log(result); - if (result == 1) { return true; } - else { return false; } + return (result == 1); } );

1 0

[atlas/master] Use the page-header class to accentuate headers
by irl＠torproject.org 18 May '17

18 May '17

commit e7da05520151ae1de960a45437ee6bd31a9d16ee Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri May 12 14:11:19 2017 +0000 Use the page-header class to accentuate headers The page-header class uses a bottom border which makes using horizontal rules obsolete. Closes #22239. --- index.html | 4 +++- templates/about.html | 4 ++-- templates/details/bridge.html | 6 +++--- templates/details/router.html | 6 +++--- templates/search/do.html | 2 ++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index bbd70c2..6d2b684 100644 --- a/index.html +++ b/index.html @@ -52,8 +52,10 @@ </div> <div id="content"> <noscript> + <div class="page-header"> <h1>JavaScript required</h1> - <p>Please enable JavaScript to use this service.</p> + </div> + <p class="lead">Please enable JavaScript to use this service.</p> </noscript> </div> <hr/> diff --git a/templates/about.html b/templates/about.html index 1cff2b4..f24c807 100644 --- a/templates/about.html +++ b/templates/about.html @@ -1,9 +1,9 @@ -<header id="about"> +<div class="page-header"> <h1>Atlas</h1> +</div> <p class="lead"> Atlas is a web application to discover Tor relays. It provides useful information on how relays are configured along with graphics about their past. </p> -</header> <div class="page-header"> <h1>Features</h1> diff --git a/templates/details/bridge.html b/templates/details/bridge.html index a34701b..c2e5b80 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -7,8 +7,9 @@ <% } %> </h1> +<div class="page-header"> <h2>General <small>Overall information on the Tor bridge</small></h2> -<hr/> +</div> <div class="row"> <div class="span6"> @@ -85,9 +86,8 @@ </div> </div> -<div class="row"> +<div class="page-header"> <h2>Graphs <small>Pretty graphs</small></h2> -<hr/> </div> <div class="row"> diff --git a/templates/details/router.html b/templates/details/router.html index 46f935f..7ea26bf 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -7,8 +7,9 @@ <% } %> </h1> +<div class="page-header"> <h2>General <small>Overall information on the Tor relay</small></h2> -<hr/> +</div> <div class="row"> <div class="span6"> @@ -139,9 +140,8 @@ </div> </div> -<div class="row"> +<div class="page-header"> <h2>Graphs <small>Pretty graphs</small></h2> -<hr/> </div> <div class="row"> diff --git a/templates/search/do.html b/templates/search/do.html index 02dbe1a..a117d0e 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -49,7 +49,9 @@ </div> <% } %> +<div class="page-header"> <h1 id="search-title"></h1> +</div> <table class="table table-bordered table-striped" id="torstatus_results"> <thead> <tr>

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 May '17

17 May '17

commit 5b51877720ba4a352bc171c1153b23957ea3c863 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 17 23:15:35 2017 +0000 Update translations for tails-persistence-setup --- da/da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da/da.po b/da/da.po index 88d7abc..fe5dc1f 100644 --- a/da/da.po +++ b/da/da.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-05-17 03:09+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-05-17 23:14+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,7 @@ msgstr "Pidgin profiler og OTR nøglering" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Thunderbird" -msgstr "" +msgstr "Thunderbird" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Thunderbird profiles and locally stored email"

1 0