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

[onionoo/master] Add build revision field to documents.
by karsten＠torproject.org 09 Oct '17

09 Oct '17

commit 0f28ea28f53542b13beedd3d8255c0dfeccd7aec Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Sep 19 10:06:35 2017 +0000 Add build revision field to documents. Implements task-23778. --- CHANGELOG.md | 2 ++ build.xml | 2 +- .../torproject/onionoo/server/ResponseBuilder.java | 24 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9a171d..b7b379c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Only set the "running" field in a bridge's details document to true if the bridge is both contained in the last known bridge network status and has the "Running" flag assigned there. + - Add build_revision to documents, if available. + - Update to metrics-lib 2.1.1. * Minor changes - Remove placeholder page on index.html. diff --git a/build.xml b/build.xml index c8a4173..72f3ecc 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="onionoo.protocol.version" value="4.1"/> <property name="release.version" value="${onionoo.protocol.version}-1.5.0-dev"/> - <property name="metricslibversion" value="2.1.0"/> + <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="onionoo-${release.version}.war"/> diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index efa02c3..6b6b8ee 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -18,16 +18,37 @@ import com.google.gson.GsonBuilder; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import java.util.Properties; public class ResponseBuilder { + private static final Logger logger = + LoggerFactory.getLogger(ResponseBuilder.class); + private DocumentStore documentStore; + private String buildRevision; + /** Initialize document store and the build revision. */ public ResponseBuilder() { this.documentStore = DocumentStoreFactory.getDocumentStore(); + Properties buildProperties = new Properties(); + try (InputStream is = getClass().getClassLoader() + .getResourceAsStream("onionoo.buildrevision.properties")) { + buildProperties.load(is); + buildRevision = buildProperties.getProperty("onionoo.build.revision", + null); + } catch (Exception ex) { + // We create documents anyway: only log a warning. + logger.warn("No build revision available.", ex); + buildRevision = null; + } } private String resourceType; @@ -112,6 +133,9 @@ public class ResponseBuilder { this.write(pw, "\"next_major_version_scheduled\":\"%s\",\n", NEXT_MAJOR_VERSION_SCHEDULED); } + if (null != buildRevision) { + this.write(pw, "\"build_revision\":\"%s\",\n", buildRevision); + } this.write(pw, "\"relays_published\":\"%s\",\n", this.relaysPublishedString); if (this.relaysSkipped > 0) {

1 0

[metrics-web/master] Replace – with – in news.json.
by karsten＠torproject.org 09 Oct '17

09 Oct '17

commit d4dd3ddd3ac8d06470105df2fa1fecaba605b7ad Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 9 15:41:20 2017 +0200 Replace – with – in news.json. --- website/src/main/resources/etc/news.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index cdc0ef1..a711924 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -4,7 +4,7 @@ "protocols": [ "<OR>" ], - "description": "Release of tor 0.2.2.22-alpha. Changes the TLS Diffie–Hellman parameter to match that used by Apache mod_ssl, to evade blocking in Iran.", + "description": "Release of tor 0.2.2.22-alpha. Changes the TLS Diffie–Hellman parameter to match that used by Apache mod_ssl, to evade blocking in Iran.", "links": [ "<a href=\"https://trac.torproject.org/projects/tor/wiki/doc/OONI/censorshipwiki/Censo…">censorshipwiki entry</a>", "<a href=\"https://trac.torproject.org/projects/tor/wiki/org/projects/Tor/TLSHistory#S…">tor TLSHistory</a>" @@ -1271,7 +1271,7 @@ "places": [ "cn" ], - "description": "Guo Wengui speaks at the National Press Club, 09:00–11:00 eastern time. Reports of disruption of VPNs, Tor, Psiphon, Lantern, Shadowsocks in China.", + "description": "Guo Wengui speaks at the National Press Club, 09:00–11:00 eastern time. Reports of disruption of VPNs, Tor, Psiphon, Lantern, Shadowsocks in China.", "links": [ "<a href=\"https://www.msn.com/en-sg/money/markets/exiled-chinese-billionaire-blasts-k…">article on conference</a>", "<a href=\"https://twitter.com/szshu/status/916289656169275392\">tweet</a>",

1 0

[metrics-web/master] Update news.json to version 149 of doc/MetricsTimeline.
by karsten＠torproject.org 09 Oct '17

09 Oct '17

commit cce97ea81409acaa70308b0d29ee8894ecf87684 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 9 15:31:36 2017 +0200 Update news.json to version 149 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index eb62226..cdc0ef1 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -1266,6 +1266,20 @@ "description": "Outage of the bridge authority <a href=\"https://atlas.torproject.org/#details/1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D…">Bifroest</a>." }, { + "start": "2017-10-05", + "end": "2017-10-05", + "places": [ + "cn" + ], + "description": "Guo Wengui speaks at the National Press Club, 09:00–11:00 eastern time. Reports of disruption of VPNs, Tor, Psiphon, Lantern, Shadowsocks in China.", + "links": [ + "<a href=\"https://www.msn.com/en-sg/money/markets/exiled-chinese-billionaire-blasts-k…">article on conference</a>", + "<a href=\"https://twitter.com/szshu/status/916289656169275392\">tweet</a>", + "<a href=\"https://twitter.com/paulwang_xz/status/916633633548525568\">tweet</a>", + "<a href=\"https://twitter.com/iuui/status/916583990085033985\">tweet</a>" + ] + }, + { "start": "2016-02-24", "places": [ "tm" @@ -1718,5 +1732,13 @@ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">tr graph</a>" ], "unknown": true + }, + { + "start": "2017-09-15", + "description": "timeouts on the tor network increased, download speed improved", + "links": [ + "<a href=\"https://twitter.com/nusenu_/status/916453594517434368\">tweet</a>" + ], + "unknown": true } ]

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 09 Oct '17

09 Oct '17

commit 7351562757ba1e256c0dbbc209dc01d865ca73c6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 9 04:50:45 2017 +0000 Update translations for tor-browser-manual --- ga/ga.po | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ga/ga.po b/ga/ga.po index b5bc173af..6c626f902 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -969,6 +969,7 @@ msgstr "" #: plugins.page:6 msgid "How Tor Browser handles add-ons, plugins and JavaScript" msgstr "" +"Conas a láimhseálann Brabhsálaí Tor breiseáin, forlíontáin, agus JavaScript" #: plugins.page:10 msgid "Plugins, add-ons and JavaScript" @@ -1158,6 +1159,8 @@ msgid "" "Network location of the computer used to visit the website (the public IP " "address)." msgstr "" +"Seoladh an ríomhaire a úsáideadh chun cuairt a thabhairt ar an suíomh (an " +"seoladh IP poiblí)." #: secure-connections.page:115 msgid "Whether or not Tor is being used." @@ -1279,6 +1282,7 @@ msgid "" "At this level, all browser features are enabled. This is the most usable " "option." msgstr "" +"Ag an leibhéal seo, tá gach gné cumasaithe. Seo an rogha is inúsáidte." #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" @@ -1371,7 +1375,7 @@ msgstr "" #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" -msgstr "" +msgstr "Cad is féidir a dhéanamh mura bhfuil Brabhsálaí Tor ag obair" #: troubleshooting.page:12 msgid "" @@ -1389,6 +1393,8 @@ msgid "" "If Tor Browser doesn’t connect, there may be a simple solution. Try each of " "the following:" msgstr "" +"Murar féidir le Brabhsálaí Tor ceangal leis an líonra, seans go bhfuil " +"réiteach simplí ann. Bain triail as gach ceann de na moltaí seo:" #: troubleshooting.page:29 msgid "" @@ -1458,7 +1464,7 @@ msgstr "" #: uninstalling.page:6 msgid "How to remove Tor Browser from your system" -msgstr "" +msgstr "Conas Brabhsálaí Tor a bhaint de do chóras" #: uninstalling.page:10 msgid "Uninstalling" @@ -1595,6 +1601,8 @@ msgid "" "When you are prompted to update Tor Browser, finish the browsing session and" " close the program." msgstr "" +"Nuair a iarrfar ort Brabhsálaí Tor a nuashonrú, críochnaigh an seisiún " +"brabhsála agus dún an ríomhchlár." #: updating.page:67 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 09 Oct '17

09 Oct '17

commit 34e4cbd37a08d4125fe751164ba45118dda182e1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 9 04:20:41 2017 +0000 Update translations for tor-browser-manual --- ga/ga.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ga/ga.po b/ga/ga.po index dce1d1f19..b5bc173af 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -22,6 +22,8 @@ msgstr "Kevin Scannell <kscanne at gmail>, 2017" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" msgstr "" +"Foghlaim conas is féidir Brabhsálaí Tor a úsáid chun do phríobháideachas " +"agus d'aitheantas a chosaint ar líne." #: about-tor-browser.page:10 msgid "About Tor Browser" @@ -54,8 +56,8 @@ msgid "" msgstr "" "Feicfidh na daoine atá i gceannas ar na suímh agus ar na seirbhísí a " "úsáideann tú, agus na daoine ag breathnú orthu, ceangal ag teacht ó líonra " -"Tor seachas ó d'fhíorsheoladh IP, agus ní bheidh a fhios acu cé thú féin " -"mura ligeann tú d'aithne chucu d'aon turas." +"Tor seachas ó d'fhíorsheoladh Idirlín (IP), agus ní bheidh a fhios acu cé " +"thú féin mura ligeann tú d'aithne chucu d'aon turas." #: about-tor-browser.page:34 msgid "" @@ -63,8 +65,8 @@ msgid "" "“fingerprinting” or identifying you based on your browser configuration." msgstr "" "Chomh maith leis sin, déanann Brabhsálaí Tor a dhícheall cosc a chur ar " -"“mhéarlorgaireacht”, is é sin daoine a aithint bunaithe ar chumraíocht a " -"mbrabhsálaí." +"“mhéarlorgaireacht”, is é sin bheith do d'aithint bunaithe ar chumraíocht do" +" bhrabhsálaí." #: about-tor-browser.page:39 msgid "" @@ -436,7 +438,7 @@ msgid "" msgstr "" "Más mian leat Brabhsálaí Tor i mBéarla ar OS X a íoslódáil, seol " "Teachtaireacht Dhíreach chuig @get_tor leis na focail \"osx en\" (ní gá duit" -" an cuntas a leanúint), agus gheobhaidh tú nasc leis an íoslódáil." +" an cuntas a leanúint), agus gheobhaidh tú nasc lena íoslódáil." #: downloading.page:70 msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):" @@ -449,7 +451,7 @@ msgid "" msgstr "" "Más mian leat Brabhsálaí Tor i Sínis ar Linux a íoslódáil, seol " "teachtaireacht chuig gettor(a)torproject.org leis na focail \"linux zh\" inti " -"agus gheobhaidh tú nasc leis an íoslódáil." +"agus gheobhaidh tú nasc lena íoslódáil." #: downloading.page:84 msgid "Satori"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 09 Oct '17

09 Oct '17

commit 26d1005f3f385eec345c30fb756802c51112c435 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 9 03:50:44 2017 +0000 Update translations for tor-browser-manual --- ga/ga.po | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/ga/ga.po b/ga/ga.po index 941739bf0..dce1d1f19 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -434,6 +434,9 @@ msgid "" "Message to @get_tor with the words \"osx en\" in it (you don't need to " "follow the account)." msgstr "" +"Más mian leat Brabhsálaí Tor i mBéarla ar OS X a íoslódáil, seol " +"Teachtaireacht Dhíreach chuig @get_tor leis na focail \"osx en\" (ní gá duit" +" an cuntas a leanúint), agus gheobhaidh tú nasc leis an íoslódáil." #: downloading.page:70 msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):" @@ -444,6 +447,9 @@ msgid "" "To get links for downloading Tor Browser in Chinese for Linux, send a " "message to gettor(a)torproject.org with the words \"linux zh\" in it." msgstr "" +"Más mian leat Brabhsálaí Tor i Sínis ar Linux a íoslódáil, seol " +"teachtaireacht chuig gettor(a)torproject.org leis na focail \"linux zh\" inti " +"agus gheobhaidh tú nasc leis an íoslódáil." #: downloading.page:84 msgid "Satori" @@ -475,6 +481,11 @@ msgid "" "after the name of the program — each one represents a different source from " "which to get the software. Your download will then begin." msgstr "" +"Nuair a osclaíonn Satori, cliceáil do rogha teanga. Osclóidh roghchlár a " +"thaispeánann na híoslódálacha atá ar fáil don teanga sin. Aimsigh an " +"iontráil do Bhrabhsálaí Tor faoi ainm do chórais oibriúcháin. Roghnaigh “A” " +"nó “B” tar éis ainm an fheidhmchláir — seasann siad d'fhoinsí éagsúla ónar " +"féidir leat an bogearra a fháil. Ansin tosóidh an íoslódáil." #: downloading.page:115 msgid "" @@ -507,6 +518,9 @@ msgid "" "Settings window. This offers you the option to connect directly to the Tor " "network, or to configure Tor Browser for your connection." msgstr "" +"Nuair a úsáideann tú Brabhsálaí Tor den chéad uair, feicfidh tú an fhuinneog" +" Socruithe Líonra Tor. Tugann seo rogha duit ceangal go díreach le líonra " +"Tor, nó Brabhsálaí Tor a chur in oiriúint do do cheangal líonra féin." #: first-time.page:19 msgid "Connect" @@ -545,6 +559,9 @@ msgid "" "select this option. Tor Browser will take you through a series of " "configuration options." msgstr "" +"Má tá a fhios agat go bhfuil do cheangal faoi chinsireacht, nó má úsáideann " +"sé seachfhreastalaí, ba chóir duit é seo a roghnú. Treoróidh Brabhsálaí Tor " +"tríd an bpróiseas cumraíochta thú." #: first-time.page:44 msgid "" @@ -617,7 +634,7 @@ msgstr "" #: known-issues.page:23 msgid "Webroot SecureAnywhere" -msgstr "" +msgstr "Webroot SecureAnywhere" #: known-issues.page:26 msgid "Kaspersky Internet Security 2012" @@ -629,7 +646,7 @@ msgstr "Bogearra Frithvíreas Sophos ar Mac" #: known-issues.page:32 msgid "Microsoft Security Essentials" -msgstr "" +msgstr "Riachtanais Slándála Microsoft" #: known-issues.page:37 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 09 Oct '17

09 Oct '17

commit 76486bc442db10d675b7dceebd5acf0e25d7d784 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 9 03:20:44 2017 +0000 Update translations for tor-browser-manual --- ga/ga.po | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ga/ga.po b/ga/ga.po index 1b5d6544f..941739bf0 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -89,6 +89,11 @@ msgid "" " last relay in the circuit (the “exit relay”) then sends the traffic out " "onto the public Internet." msgstr "" +"Is líonra tollán fíorúil é Tor a chabhraíonn leat do phríobháideachas agus " +"do shlándáil ar an Idirlíon a fheabhsú. Seolann Tor do chuid tráchta trí trí" +" fhreastalaí randamacha (a dtugtar <em>athsheachadáin</em> orthu) i líonra " +"Tor. Ansin seolann an t-athsheachadán deireanach sa chiorcad (\"an " +"t-athsheachadán amach\") an trácht amach go dtí an tIdirlíon poiblí." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -199,6 +204,10 @@ msgid "" " to the Tor network. Select “Use custom bridges” and enter each bridge " "address on a separate line." msgstr "" +"Roghnaigh \"tá\" nuair a fhiafraítear díot an bhfuil do Sholáthraí Seirbhíse" +" Idirlín ag cur cosc ar cheangail le líonra Tor. Roghnaigh “Cuir isteach " +"droichid saincheaptha” agus cuir gach seoladh droichid isteach ar a líne " +"féin." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -286,6 +295,8 @@ msgid "" "Select “yes” when asked if your Internet Service Provider blocks connections" " to the Tor network." msgstr "" +"Roghnaigh \"tá\" nuair a fhiafraítear díot an bhfuil do Sholáthraí Seirbhíse" +" Idirlín ag cur cosc ar cheangail le líonra Tor." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -341,6 +352,10 @@ msgid "" "xref=\"bridges\">Bridges</link> section to learn what bridges are and how to" " obtain them." msgstr "" +"Má bhain tú triail as na roghanna seo go léir agus ní féidir leat dul ar " +"líne fós, ní mór duit seoltaí droichid a chur isteach de láimh. Léigh an " +"rannóg maidir le <link xref=\"bridges\">Droichid</link> le foghlaim cad is " +"droichead ann agus conas is féidir iad a fháil." #: downloading.page:7 msgid "How to download Tor Browser" @@ -389,6 +404,9 @@ msgid "" "simply write “windows”, “osx”, or “linux”, (without quotation marks) " "depending on your operating system." msgstr "" +"Seol teachtaireacht rphoist chuig gettor(a)torproject.org agus cuir an focal " +"amháín “windows”, “osx”, nó “linux” (gan comharthaí athfhriotail) i gcorp na" +" teachtaireachta, ag brath ar an gcóras oibriúcháin atá agat." #: downloading.page:46 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 09 Oct '17

09 Oct '17

commit a638c0bbb3bdcf67d5e5df0dff0146c29ec045b5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 9 02:50:44 2017 +0000 Update translations for tor-browser-manual --- ga/ga.po | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ga/ga.po b/ga/ga.po index 2d10c9de9..1b5d6544f 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -52,12 +52,19 @@ msgid "" "real Internet (IP) address, and will not know who you are unless you " "explicitly identify yourself." msgstr "" +"Feicfidh na daoine atá i gceannas ar na suímh agus ar na seirbhísí a " +"úsáideann tú, agus na daoine ag breathnú orthu, ceangal ag teacht ó líonra " +"Tor seachas ó d'fhíorsheoladh IP, agus ní bheidh a fhios acu cé thú féin " +"mura ligeann tú d'aithne chucu d'aon turas." #: about-tor-browser.page:34 msgid "" "In addition, Tor Browser is designed to prevent websites from " "“fingerprinting” or identifying you based on your browser configuration." msgstr "" +"Chomh maith leis sin, déanann Brabhsálaí Tor a dhícheall cosc a chur ar " +"“mhéarlorgaireacht”, is é sin daoine a aithint bunaithe ar chumraíocht a " +"mbrabhsálaí." #: about-tor-browser.page:39 msgid ""

1 0

[atlas/master] Adds an alert to suggest updating Tor version on outdated relays
by irl＠torproject.org 09 Oct '17

09 Oct '17

commit 2177b5dadc3f34d7d45ad68b0a2a59e227825885 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Oct 9 03:08:29 2017 +0100 Adds an alert to suggest updating Tor version on outdated relays --- templates/details/router.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/details/router.html b/templates/details/router.html index bd7d302..3cab9b2 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -10,7 +10,9 @@ <div class="page-header"> <h2>General <small>Overall information on the Tor relay</small></h2> </div> - +<% if (relay.get('recommended_version') === false) { %> +<div class="alert alert-danger">This relay is running an outdated Tor version and should be updated to a recent release of Tor that may contain important fixes.</div> +<% } %> <div class="row"> <div class="span6"> <h3>Configuration</h3>

1 0

[atlas/master] Adds an alert when a new relay to link to lifecycle blog post (Closes: #23767)
by irl＠torproject.org 09 Oct '17

09 Oct '17

commit d03cdfba164134af17cfd71a361b798866e604d3 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Oct 9 03:10:32 2017 +0100 Adds an alert when a new relay to link to lifecycle blog post (Closes: #23767) --- js/models/relay.js | 17 +++++++++++++++++ templates/details/router.html | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/js/models/relay.js b/js/models/relay.js index 62b8d21..2f7b80d 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -125,6 +125,21 @@ define([ return output }, + is_new: function(utctime) { + var hr_magic = [10]; + var t = utctime.split(" "); + var utcd = t[0].split("-"); + var utct = t[1].split(":"); + var d = new Date(utcd[0], utcd[1]-1, utcd[2], utct[0], utct[1], utct[2]); + var now = new Date(); + now = new Date(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds()); + var diff = now-d; + var secs = Math.round(diff/1000); + var mins = Math.floor(secs/60); + var hours = Math.floor(mins/60); + var days = Math.floor(hours/24); + return days < 15; + }, lookup: function(options) { var success = options.success; var error = options.error; @@ -171,6 +186,8 @@ define([ relay.country = relay.country ? relay.country.toLowerCase() : null; relay.countryname = relay.country ? CountryCodes[relay.country] : null; relay.first_seen = relay.first_seen ? relay.first_seen : null; + relay.age = relay.first_seen ? model.parsedate(relay.first_seen).hrfull : null; + relay.new_relay = relay.first_seen ? model.is_new(relay.first_seen) : null; 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; diff --git a/templates/details/router.html b/templates/details/router.html index 3cab9b2..591b6cc 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -10,6 +10,9 @@ <div class="page-header"> <h2>General <small>Overall information on the Tor relay</small></h2> </div> +<% if (relay.get('new_relay') === true) {%> +<div class="alert alert-info">This relay appears to be less than 2 weeks old. <a href="https://blog.torproject.org/lifecycle-new-relay">This blog post</a> explains the lifecycle of a new relay, and why it will not be immediately fully used to capacity.</div> +<% } %> <% if (relay.get('recommended_version') === false) { %> <div class="alert alert-danger">This relay is running an outdated Tor version and should be updated to a recent release of Tor that may contain important fixes.</div> <% } %> @@ -133,7 +136,7 @@ <dd><%= relay.get('as_name') ? _.escape(relay.get('as_name')) : "unknown" %></dd> <dt><span class="tip" title="The first time that this relay was seen online.">First Seen</span></dt> - <dd><%= relay.get('first_seen') %></dd> + <dd><%= relay.get('first_seen') %> (<%= relay.get('age') %>)</dd> <dt><span class="tip" title="Date and time when the relay was last (re-)started.">Last Restarted</span></dt> <dd><%= relay.get('last_restarted') %></dd>

1 0