tor-commits August 2018

tor-commits@lists.torproject.org

17 participants
2581 discussions

[exonerator/release] Update translations.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit 3e1aa663e5ff83061dda11715dc180da996d3fb4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 10:27:58 2018 +0200 Update translations. --- src/main/resources/ExoneraTor_de.properties | 18 ++++++++++-------- src/main/resources/ExoneraTor_fr.properties | 22 ++++++++++++---------- src/main/resources/ExoneraTor_ro.properties | 14 ++++++++------ src/main/resources/ExoneraTor_sv.properties | 18 ++++++++++-------- 4 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/main/resources/ExoneraTor_de.properties b/src/main/resources/ExoneraTor_de.properties index d830e31..fbe8464 100644 --- a/src/main/resources/ExoneraTor_de.properties +++ b/src/main/resources/ExoneraTor_de.properties @@ -4,14 +4,14 @@ form.timestamp.label=Datum form.search.label=Suchen summary.heading=Zusammenfassung summary.serverproblem.dbnoconnect.title=Server-Problem -summary.serverproblem.dbnoconnect.body.text=Es kann keine Verbindung zur Datenbank hergestellt werden. Bitte versuchen Sie es sp\u00e4ter noch einmal. Sollte dieses Problem weiterhin bestehen %s. +summary.serverproblem.dbnoconnect.body.text=Es kann keine Verbindung zur Datenbank hergestellt werden. Bitte versuchen Sie es sp\u00e4ter noch einmal. Sollte dieses Problem weiterhin bestehen %s! summary.serverproblem.dbnoconnect.body.link=lassen Sie es uns bitte wissen summary.serverproblem.dbempty.title=Server-Problem -summary.serverproblem.dbempty.body.text=Die Datenbank scheint leer zu sein. Bitte versuchen Sie es sp\u00e4ter noch einmal. Sollte dieses Problem weiterhin bestehen %s. +summary.serverproblem.dbempty.body.text=Die Datenbank scheint leer zu sein. Bitte versuchen Sie es sp\u00e4ter noch einmal. Sollte dieses Problem weiterhin bestehen %s! summary.serverproblem.dbempty.body.link=lassen Sie es uns bitte wissen summary.invalidparams.notimestamp.title=Kein Datum angegeben summary.invalidparams.notimestamp.body=Sie m\u00fcssen ein Datum angeben. -summary.invalidparams.noip.title=Keine IP-Adresse angegeben. +summary.invalidparams.noip.title=Keine IP-Adresse angegeben summary.invalidparams.noip.body=Sie m\u00fcssen eine IP-Adresse angeben. summary.invalidparams.timestamprange.title=Datum au\u00dferhalb des zul\u00e4ssigen Bereichs summary.invalidparams.timestamprange.body=Die Datenbank enth\u00e4lt keine Daten vom %s. Bitte w\u00e4hlen Sie ein Datum zwischen %s und %s aus. @@ -19,8 +19,10 @@ summary.invalidparams.invalidip.title=Ung\u00fcltige IP-Adresse summary.invalidparams.invalidip.body=%s ist keine g\u00fcltige IP-Adresse. Zul\u00e4ssige IP-Adress-Formate sind %s oder %s. summary.invalidparams.invalidtimestamp.title=Ung\u00fcltiges Datum summary.invalidparams.invalidtimestamp.body=%s ist kein g\u00fcltiges Datum. Das zul\u00e4ssige Datumsformat ist %s. +summary.invalidparams.timestamptoorecent.title=Datumsparameter zu neu +summary.invalidparams.timestamptoorecent.body=M\u00f6glicherweise enth\u00e4lt die Datenbank noch nicht gen\u00fcgend Daten, um diese Anfrage korrekt zu beantworten. Das letzte g\u00fcltige Datum ist vorgestern. Bitte wiederholen Sie Ihre Suche an einem anderen Tag. summary.serverproblem.nodata.title=Server-Problem -summary.serverproblem.nodata.body.text=Die Datenbank enth\u00e4lt keine Daten f\u00fcr das angegebene Datum. Bitte versuchen Sie es sp\u00e4ter noch einmal. Sollte dieses Problem weiterhin bestehen %s. +summary.serverproblem.nodata.body.text=Die Datenbank enth\u00e4lt keine Daten f\u00fcr das angegebene Datum. Bitte versuchen Sie es sp\u00e4ter noch einmal. Sollte dieses Problem weiterhin bestehen %s! summary.serverproblem.nodata.body.link=lassen Sie es uns bitte wissen summary.negativesamenetwork.title=Keine \u00dcbereinstimmungen gefunden summary.negativesamenetwork.body=Es wurde kein Tor-Server mit der IP-Adresse %s am %s bzw. am Tag vorher oder nachher gefunden. Es wurden jedoch benachbarte IP-Adressen im selben /%d-Netzwerk an diesen Tagen gefunden: @@ -41,12 +43,12 @@ technicaldetails.exit.yes=Ja technicaldetails.exit.no=Nein permanentlink.heading=Dauerhafter Link footer.abouttor.heading=\u00dcber Tor -footer.abouttor.body.text=Tor ist ein internationales Softwareprojekt, um Internetverbindungen zu anonymisieren indem %s. Wenn Sie eine Internetverbindung sehen, die von einem Tor-Server kommt, stammt diese in der Regel von jemandem, der Tor benutzt, und nicht vom Betreiber des Tor-Servers selbst. Weder The Tor Project, Inc. noch die Tor-Server-Betreiber besitzen Aufzeichnungen \u00fcber die Internetverbindungen im Tor-Netzwerk und k\u00f6nnen daher keine Auskunft \u00fcber den Ursprung der Internetverbindung geben. Mehr Informationen \u00fcber Tor erhalten Sie %s. The Tor Project, Inc. steht Ihnen jederzeit f\u00fcr %s zur Verf\u00fcgung. -footer.abouttor.body.link1=Datenpakete verschl\u00fcsselt und \u00fcber eine Reihe von Stationen geleitet werden, bevor diese ihr Ziel erreichen +footer.abouttor.body.text=Tor ist ein internationales Softwareprojekt um Internetverbindungen zu anonymisieren indem %s. Wenn Sie eine Internetverbindung sehen, die von einem Tor-Server kommt, stammt diese in der Regel von jemandem, der Tor benutzt, und nicht vom Betreiber des Tor-Servers selbst. Weder The Tor Project, Inc. noch die Tor-Server-Betreiber besitzen Aufzeichnungen \u00fcber die Internetverbindungen im Tor-Netzwerk und k\u00f6nnen daher keine Auskunft \u00fcber den Ursprung der Internetverbindung geben. Mehr Informationen \u00fcber Tor erhalten Sie %s. The Tor Project, Inc. steht Ihnen jederzeit f\u00fcr %s zur Verf\u00fcgung. +footer.abouttor.body.link1=Datenpakete verschl\u00fcsselt und \u00fcber eine Reihe von Stationen geleitet werden bevor diese ihr Ziel erreichen footer.abouttor.body.link2=hier footer.abouttor.body.link3=Fragen footer.aboutexonerator.heading=\u00dcber ExoneraTor -footer.aboutexonerator.body=Der ExoneraTor-Dienst basiert auf einer Datenbank von IP-Adressen, die Teil des Tor-Netzwerks sind oder waren. Dieser Dienst beantwortet die Frage, ob es an einem bestimmten Tag einen Tor-Server mit einer bestimmten IP-Adresse gegeben hat. ExoneraTor kann in einigen F\u00e4llen mehr als nur eine IP-Adresse pro Tor-Server ausgeben, falls ein Tor-Server verschiedene IP-Adressen f\u00fcr ausgehende Verbindungen und die Registrierung im Tor-Netzwerk verwendet hat. ExoneraTor speichert au\u00dferdem, ob ein Tor-Server Verbindungen ins offene Internet zugelassen hat oder nicht. +footer.aboutexonerator.body=Der ExoneraTor-Dienst basiert auf einer Datenbank von IP-Adressen, die Teil des Tor-Netzwerks sind oder waren. Dieser Dienst beantwortet die Frage, ob es an einem bestimmten Tag einen Tor-Server mit einer bestimmten IP-Adresse gegeben hat. ExoneraTor kann in einigen F\u00e4llen mehr als nur eine IP-Adresse pro Tor-Server speichern, falls ein Tor-Server eine andere IP-Adresse f\u00fcr ausgehende Verbindungen verwendet hat als die IP-Adresse um sich im Tor-Netzwerk zu registrieren. ExoneraTor speichert au\u00dferdem ob ein Tor-Server Verbindungen ins offene Internet zugelassen hat oder nicht. footer.language.name=Deutsch -footer.language.text=Diese Seite gibt es auch in den folgenden Sprachen: +footer.language.text=Diese Seite ist auch in den folgenden Sprachen verf\u00fcgbar: diff --git a/src/main/resources/ExoneraTor_fr.properties b/src/main/resources/ExoneraTor_fr.properties index 70d4d2f..93c33bb 100644 --- a/src/main/resources/ExoneraTor_fr.properties +++ b/src/main/resources/ExoneraTor_fr.properties @@ -1,13 +1,13 @@ -form.explanation=Saisir une adresse IP et une date afin de savoir si l'adresse a \u00e9t\u00e9 utilis\u00e9e comme relais Tor \: +form.explanation=Saisir une adresse IP et une date afin de savoir si l'adresse a \u00e9t\u00e9 utilis\u00e9e comme relais Tor : form.ip.label=Adresse IP form.timestamp.label=Date -form.search.label=Rechercher +form.search.label=Chercher summary.heading=R\u00e9sum\u00e9 summary.serverproblem.dbnoconnect.title=Probl\u00e8me de serveur -summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter \u00e0 la base de donn\u00e9es. Veuillez ressayer ult\u00e9rieurement. Si ce probl\u00e8me perdure, veuillez %s \! +summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter \u00e0 la base de donn\u00e9es. Veuillez ressayer ult\u00e9rieurement. Si ce probl\u00e8me perdure, veuillez %s ! summary.serverproblem.dbnoconnect.body.link=nous en informer summary.serverproblem.dbempty.title=Probl\u00e8me de serveur -summary.serverproblem.dbempty.body.text=La base de donn\u00e9es semble \u00eatre vide. Veuillez ressayer ult\u00e9rieurement. Si ce probl\u00e8me perdure, veuillez %s \! +summary.serverproblem.dbempty.body.text=La base de donn\u00e9es semble \u00eatre vide. Veuillez ressayer ult\u00e9rieurement. Si ce probl\u00e8me perdure, veuillez %s ! summary.serverproblem.dbempty.body.link=nous en informer summary.invalidparams.notimestamp.title=Aucune date n'a \u00e9t\u00e9 donn\u00e9e en param\u00e8tre summary.invalidparams.notimestamp.body=D\u00e9sol\u00e9, vous devez aussi pr\u00e9ciser une date. @@ -19,11 +19,13 @@ summary.invalidparams.invalidip.title=Adresse IP invalide summary.invalidparams.invalidip.body=D\u00e9sol\u00e9, %s n'est pas une adresse IP valide. Les formats d'adresse IP attendus sont %s ou %s. summary.invalidparams.invalidtimestamp.title=Date invalide summary.invalidparams.invalidtimestamp.body=D\u00e9sol\u00e9, %s n'est pas une date valide. Le format de date attendu est %s. +summary.invalidparams.timestamptoorecent.title=Le param\u00e8tre de date est trop r\u00e9cent +summary.invalidparams.timestamptoorecent.body=La base de donn\u00e9es pourrait ne pas encore contenir suffisamment de donn\u00e9es pour r\u00e9pondre correctement \u00e0 cette requ\u00eate. Les derni\u00e8res donn\u00e9es accept\u00e9es datent d'avant-hier. Veuillez r\u00e9p\u00e9ter votre recherche dans un jour. summary.serverproblem.nodata.title=Probl\u00e8me de serveur -summary.serverproblem.nodata.body.text=La base de donn\u00e9es ne contient aucune donn\u00e9e pour la date demand\u00e9e. Veuillez ressayer ult\u00e9rieurement. Si le probl\u00e8me perdure, veuillez %s \! +summary.serverproblem.nodata.body.text=La base de donn\u00e9es ne contient aucune donn\u00e9e pour la date demand\u00e9e. Veuillez ressayer ult\u00e9rieurement. Si le probl\u00e8me perdure, veuillez %s ! summary.serverproblem.nodata.body.link=nous en informer summary.negativesamenetwork.title=R\u00e9sultat n\u00e9gatif -summary.negativesamenetwork.body=Nous n'avons pas trouv\u00e9 l'adresse IP %s, le %s ou \u00e0 un jour pr\u00e8s. Mais nous avons trouv\u00e9 d'autres adresses IP de relais Tor dans le m\u00eame r\u00e9seau /%d aux alentours de cette date \: +summary.negativesamenetwork.body=Nous n'avons pas trouv\u00e9 l'adresse IP %s, le %s ou \u00e0 un jour pr\u00e8s. Mais nous avons trouv\u00e9 d'autres adresses IP de relais Tor dans le m\u00eame r\u00e9seau /%d aux alentours de cette date : summary.positive.title=R\u00e9sultat positif summary.positive.body=Nous avons trouv\u00e9 un ou plusieurs relais Tor \u00e0 l'adresse IP %s probablement connus des clients Tor le %s ou \u00e0 un jour pr\u00e8s. summary.negative.title=R\u00e9sultat n\u00e9gatif @@ -31,7 +33,7 @@ summary.negative.body=Nous n'avons pas trouv\u00e9 l'adresse IP %s, le %s ou \u0 technicaldetails.heading=D\u00e9tails techniques technicaldetails.pre=Recherche de l'adresse IP %s, le %s ou \u00e0 un jour pr\u00e8s. Des clients Tor pourraient avoir choisi ce ou ces relais Tor pour construire des circuits. technicaldetails.colheader.timestamp=Date et heure (UTC) -technicaldetails.colheader.ip=Adresse(s) IP +technicaldetails.colheader.ip=Adresses IP technicaldetails.colheader.fingerprint=Empreinte technicaldetails.colheader.nickname=Pseudonyme technicaldetails.colheader.exit=Relais de sortie @@ -41,12 +43,12 @@ technicaldetails.exit.yes=Oui technicaldetails.exit.no=Non permanentlink.heading=Lien permanent footer.abouttor.heading=\u00c0 propos de Tor -footer.abouttor.body.text=Tor est un projet international d\u00e9veloppant des logiciels pour anonymiser le trafic Internet en %s. Par cons\u00e9quent, si vous voyez du trafic en provenance d'un relais Tor, ce trafic provient habituellement de quelqu'un qui utilise Tor, plut\u00f4t que de l'op\u00e9rateur du relais. Le projet Tor et les op\u00e9rateurs de relais Tor n'ont aucune trace du trafic relay\u00e9 par le r\u00e9seau et ne peuvent donc fournir aucune information sur son origine. N'h\u00e9sitez pas \u00e0 vous %s et n'h\u00e9sitez pas \u00e0 %s pour obtenir d'avantage d'informations. +footer.abouttor.body.text=Tor est un projet international d\u00e9veloppant des logiciels pour anonymiser le trafic Internet en %s. Par cons\u00e9quent, si vous voyez du trafic en provenance d'un relais Tor, ce trafic provient habituellement de quelqu'un qui utilise Tor, plut\u00f4t que de l'op\u00e9rateur du relais. Le Projet Tor et les op\u00e9rateurs de relais Tor n'ont aucune trace du trafic relay\u00e9 par le r\u00e9seau et ne peuvent donc fournir aucune information sur son origine. N'h\u00e9sitez pas \u00e0 vous %s et n'h\u00e9sitez pas \u00e0 %s pour obtenir d'avantage d'informations. footer.abouttor.body.link1=chiffrant les paquets et en les faisant transiter par une s\u00e9rie de relais avant qu'ils n'atteignent leur destination footer.abouttor.body.link2=renseigner d'avantage au sujet de Tor -footer.abouttor.body.link3=contacter \u00ab\u00a0The Tor Project, Inc.\u00a0\u00bb +footer.abouttor.body.link3=contacter \u00ab The Tor Project, Inc. \u00bb footer.aboutexonerator.heading=\u00c0 propos d'ExoneraTor footer.aboutexonerator.body=Le service ExoneraTor g\u00e8re une base de donn\u00e9es d'adresses IP qui ont fait partie du r\u00e9seau Tor. Il permet de savoir si un relais Tor fonctionnait pour une adresse IP donn\u00e9e \u00e0 une date pr\u00e9cise. ExoneraTor peut enregistrer plus d'une adresse IP par relais si ces derniers utilisent une adresse IP diff\u00e9rente pour se connecter \u00e0 Internet de celle utilis\u00e9e pour s'enregistrer sur le r\u00e9seau Tor. ExoneraTor enregistre \u00e9galement les dates et heures auxquelles un relais a permis de faire transiter du trafic en provenance de Tor vers Internet. footer.language.name=fran\u00e7ais -footer.language.text=Cette page est aussi disponible dans les langues suivantes : +footer.language.text=Cette page est \u00e9galement propos\u00e9e dans les langues suivantes : diff --git a/src/main/resources/ExoneraTor_ro.properties b/src/main/resources/ExoneraTor_ro.properties index 3663c06..3d58072 100644 --- a/src/main/resources/ExoneraTor_ro.properties +++ b/src/main/resources/ExoneraTor_ro.properties @@ -1,13 +1,13 @@ -form.explanation=Introduce\u021bi o adres\u0103 IP si o dat\u0103 pentru a afla dac\u0103 respectiva adresa a fost folosita de un nod Tor. +form.explanation=Introduce\u021bi o adres\u0103 IP si o dat\u0103 pentru a afla dac\u0103 respectiva adresa a fost folosita de un nod Tor: form.ip.label=Adres\u0103 IP form.timestamp.label=Dat\u0103 form.search.label=Caut\u0103 summary.heading=Sumar summary.serverproblem.dbnoconnect.title=Problem\u0103 de server -summary.serverproblem.dbnoconnect.body.text=Imposibil de conectat la baza de date. V\u0103 rug\u0103m s\u0103 re\u00eencerca\u021bi mai t\u00eerziu. Dac\u0103 problema persist\u0103, v\u0103 rug\u0103m %s\! +summary.serverproblem.dbnoconnect.body.text=Imposibil de conectat la baza de date. V\u0103 rug\u0103m s\u0103 re\u00eencerca\u021bi mai t\u00eerziu. Dac\u0103 problema persist\u0103, v\u0103 rug\u0103m %s! summary.serverproblem.dbnoconnect.body.link=Informa\u021bi-ne summary.serverproblem.dbempty.title=Problem\u0103 de server -summary.serverproblem.dbempty.body.text=Baza de date pare a fi goal\u0103. V\u0103 rug\u0103m s\u0103 re\u00eencerca\u021bi mai t\u00eerziu. Dac\u0103 problema persist\u0103, v\u0103 rug\u0103m %s\! +summary.serverproblem.dbempty.body.text=Baza de date pare a fi goal\u0103. V\u0103 rug\u0103m s\u0103 re\u00eencerca\u021bi mai t\u00eerziu. Dac\u0103 problema persist\u0103, v\u0103 rug\u0103m %s! summary.serverproblem.dbempty.body.link=Informa\u021bi-ne summary.invalidparams.notimestamp.title=Lips\u0103 parametru dat\u0103 summary.invalidparams.notimestamp.body=Ne pare r\u0103u, dar trebuie s\u0103 introduce\u021bi un parametru dat\u0103. @@ -19,11 +19,13 @@ summary.invalidparams.invalidip.title=Parametrul adresei IP este incorect summary.invalidparams.invalidip.body=Ne pare r\u0103u, %s nu este o adres\u0103 IP valid\u0103. Formatele corecte ale unei adresei IP sunt %s sau %s. summary.invalidparams.invalidtimestamp.title=Parametru dat\u0103 incorect summary.invalidparams.invalidtimestamp.body=Ne pare r\u0103u, %s nu este o dat\u0103 valid\u0103. Formatul corect al datei este %s. +summary.invalidparams.timestamptoorecent.title=Parametrul dat\u0103 e prea recent +summary.invalidparams.timestamptoorecent.body=Baza de date e posibil s\u0103 nu con\u021bin\u0103 suficiente date pentru a r\u0103spunde corect la aceast\u0103 cerere. Ultimele date acceptate sunt de acum dou\u0103 zile. Repet\u0103 c\u0103utarea alta dat\u0103. summary.serverproblem.nodata.title=Problem\u0103 de server -summary.serverproblem.nodata.body.text=Baza de date nu con\u021bine informatii pentru data solicitat\u0103. V\u0103 rug\u0103m \u00eencerca\u021bi mai t\u00e2rziu. Dac\u0103 problema persist\u0103, va rug\u0103m %s\! +summary.serverproblem.nodata.body.text=Baza de date nu con\u021bine informatii pentru data solicitat\u0103. V\u0103 rug\u0103m \u00eencerca\u021bi mai t\u00e2rziu. Dac\u0103 problema persist\u0103, va rug\u0103m %s! summary.serverproblem.nodata.body.link=Informa\u021bi-ne summary.negativesamenetwork.title=Rezultatul este negativ -summary.negativesamenetwork.body=Nu am g\u0103sit adresa IP %s la data de %s sau la o zi distan\u021b\u0103. Dar am g\u0103sit alte adrese IP folosite de noduri Tor \u00een aceea\u0219i /%d re\u021bea \u00een jurul orei\: +summary.negativesamenetwork.body=Nu am g\u0103sit adresa IP %s la data de %s sau la o zi distan\u021b\u0103. Dar am g\u0103sit alte adrese IP folosite de noduri Tor \u00een aceea\u0219i /%d re\u021bea \u00een jurul orei: summary.positive.title=Rezultatul este pozitiv summary.positive.body=Am g\u0103sit unul sau mai multe noduri Tor care au folosit adresa IP %s la data de %s sau la o zi distan\u021b\u0103 care puteau fi cunoscute de clien\u021bii Tor. summary.negative.title=Rezultatul este negativ @@ -48,5 +50,5 @@ footer.abouttor.body.link3=contacta\u021bi The Tor Project, Inc. footer.aboutexonerator.heading=Despre ExoneraTor footer.aboutexonerator.body=Serviciul ExoneraTor opereaz\u0103 o baz\u0103 de date de adrese IP care au fost parte din re\u021belaua Tor la un anumit moment.  Acest serviciu r\u0103spunde la \u00eentrebarea dac\u0103 a existat un nod Tor care a func\u021bionat pe o anumit\u0103 adres\u0103 IP la o anumit\u0103 dat\u0103.  ExoneraTor poate stoca mai mult de o adresa IP per nod dac\u0103 nodurile folosesc o alt\u0103 adres\u0103 IP pentru a ie\u0219i pe internet dec\u00e2t cea folosit\u0103 pentru \u00eenregistrarea \u00een re\u021beaua Tor \u0219i stocheaz\u0103 dac\u0103 un nod a permis tranzitarea de trafic din re\u021beaua Tor catre internetul public la acea dat\u0103. footer.language.name=rom\u00e2n\u0103 -footer.language.text=Aceast\u0103 pagin\u0103 mai este disponibil\u0103 \u00een urm\u0103toarele limbi: +footer.language.text=Aceast\u0103 pagin\u0103 este de asemenea disponibil\u0103 \u00een urm\u0103toarele limbi: diff --git a/src/main/resources/ExoneraTor_sv.properties b/src/main/resources/ExoneraTor_sv.properties index 277a5b8..8e649bd 100644 --- a/src/main/resources/ExoneraTor_sv.properties +++ b/src/main/resources/ExoneraTor_sv.properties @@ -1,29 +1,31 @@ -form.explanation=Ange en IP-adress och ett datum f\u00f6r att f\u00e5 reda p\u00e5 om adressen anv\u00e4ndes av ett Tor-rel\u00e4\: +form.explanation=Ange en IP-adress och ett datum f\u00f6r att f\u00e5 reda p\u00e5 om adressen anv\u00e4ndes av ett Tor-rel\u00e4: form.ip.label=IP-adress form.timestamp.label=Datum form.search.label=S\u00f6k summary.heading=Sammanfattning summary.serverproblem.dbnoconnect.title=Serverproblem -summary.serverproblem.dbnoconnect.body.text=Kunde inte ansluta till databasen. V\u00e4nligen f\u00f6rs\u00f6k igen senare. Om problemet kvarst\u00e5r, v\u00e4nligen %s\! +summary.serverproblem.dbnoconnect.body.text=Kunde inte ansluta till databasen. V\u00e4nligen f\u00f6rs\u00f6k igen senare. Om problemet kvarst\u00e5r, v\u00e4nligen %s! summary.serverproblem.dbnoconnect.body.link=l\u00e5t oss f\u00e5 veta summary.serverproblem.dbempty.title=Serverproblem -summary.serverproblem.dbempty.body.text=Databasen verkar vara tom. V\u00e4nligen f\u00f6rs\u00f6k igen senare. Om problemet kvarst\u00e5r, v\u00e4nligen %s\! +summary.serverproblem.dbempty.body.text=Databasen verkar vara tom. V\u00e4nligen f\u00f6rs\u00f6k igen senare. Om problemet kvarst\u00e5r, v\u00e4nligen %s! summary.serverproblem.dbempty.body.link=l\u00e5t oss f\u00e5 veta summary.invalidparams.notimestamp.title=Inget datum angivet -summary.invalidparams.notimestamp.body=Datum m\u00e5ste anges. +summary.invalidparams.notimestamp.body=Tyv\u00e4rr ett datum m\u00e5ste anges summary.invalidparams.noip.title=Ingen IP-adress angiven summary.invalidparams.noip.body=IP-adress m\u00e5ste anges. summary.invalidparams.timestamprange.title=Ogiltigt datum summary.invalidparams.timestamprange.body=Databasen inneh\u00e5ller inte n\u00e5got data f\u00f6r %s. V\u00e4nligen v\u00e4lj ett datum mellan %s och %s. summary.invalidparams.invalidip.title=Felaktig IP-adress summary.invalidparams.invalidip.body=%s \u00e4r inte en giltig IP-adress. F\u00f6rv\u00e4ntat format p\u00e5 IP-adresser \u00e4r %s eller %s. -summary.invalidparams.invalidtimestamp.title=Ogiltigt datum. +summary.invalidparams.invalidtimestamp.title=Ogiltigt datum summary.invalidparams.invalidtimestamp.body=%s \u00e4r inte ett giltigt datum. F\u00f6rv\u00e4ntat datumformat \u00e4r %s. +summary.invalidparams.timestamptoorecent.title=Datum f\u00f6r nyligen +summary.invalidparams.timestamptoorecent.body=Databasen kanske inte inneh\u00e5ller tillr\u00e4ckligt med data f\u00f6r att korrekt svara p\u00e5 denna f\u00f6rfr\u00e5gan. De senast accepterade data \u00e4r i f\u00f6rrg\u00e5r. Upprepa din s\u00f6kning p\u00e5 en annan dag. summary.serverproblem.nodata.title=Serverproblem -summary.serverproblem.nodata.body.text=Databasen inneh\u00e5ller inte n\u00e5got data f\u00f6r det efterfr\u00e5gade datumet. V\u00e4nligen f\u00f6rs\u00f6k igen senare. Om problemet kvarst\u00e5r, v\u00e4nligen %s\! +summary.serverproblem.nodata.body.text=Databasen inneh\u00e5ller inte n\u00e5got data f\u00f6r det efterfr\u00e5gade datumet. V\u00e4nligen f\u00f6rs\u00f6k igen senare. Om problemet kvarst\u00e5r, v\u00e4nligen %s! summary.serverproblem.nodata.body.link=l\u00e5t oss f\u00e5 veta summary.negativesamenetwork.title=Resultatet \u00e4r negativt -summary.negativesamenetwork.body=Vi kunde inte hitta IP-adress %s p\u00e5 eller inom en dag fr\u00e5n %s. Men vi hittade andra IP-adresser som anv\u00e4ndes av Tor-rel\u00e4n i samma /%d-n\u00e4tverk runt den tiden\: +summary.negativesamenetwork.body=Vi kunde inte hitta IP-adress %s p\u00e5 eller inom en dag fr\u00e5n %s. Men vi hittade andra IP-adresser som anv\u00e4ndes av Tor-rel\u00e4n i samma /%d-n\u00e4tverk runt den tiden: summary.positive.title=Resultatet \u00e4r positivt summary.positive.body=Vi hittade ett eller flera Tor-rel\u00e4n p\u00e5 IP-adress %s p\u00e5 eller inom en dag fr\u00e5n %s som Tor-klienter f\u00f6rmodligen k\u00e4nde till. summary.negative.title=Resultatet \u00e4r negativt @@ -48,5 +50,5 @@ footer.abouttor.body.link3=kontakta Tor-projektet footer.aboutexonerator.heading=Om ExoneraTor footer.aboutexonerator.body=Tj\u00e4nsten ExoneraTor uppr\u00e4tth\u00e5ller en databas \u00f6ver IP-adresser som har varit en del av Tor-n\u00e4tverket. Den ger svar p\u00e5 fr\u00e5gan om det var ett Tor-rel\u00e4 som anv\u00e4nde en viss IP-adress vid ett givet datum. ExoneraTor kan komma att lagra fler \u00e4n en IP-adress per rel\u00e4 f\u00f6r rel\u00e4n som anv\u00e4nder en annan IP-adress f\u00f6r att ansluta till internet \u00e4n den som anv\u00e4ndes f\u00f6r att registrera sig i Tor-n\u00e4tverket. Huruvida ett rel\u00e4 har till\u00e5tit Tor-trafik ut mot internet vid tidpunkten eller ej lagras ocks\u00e5. footer.language.name=svenska -footer.language.text=Denna sida finns \u00e4ven p\u00e5 f\u00f6ljande spr\u00e5k: +footer.language.text=Den h\u00e4r sidan finns ocks\u00e5 p\u00e5 f\u00f6ljande spr\u00e5k:

1 0

[exonerator/release] Remove unthrown exceptions.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit ad4da7d82f95cd89b43717aacc0b4cffbf8d6aa4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 14:48:09 2018 +0200 Remove unthrown exceptions. --- .../metrics/exonerator/ExoneraTorServlet.java | 47 +++++++++------------- .../metrics/exonerator/QueryServlet.java | 4 +- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index 9099025..4c85480 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -61,8 +61,7 @@ public class ExoneraTorServlet extends HttpServlet { @Override public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, - ServletException { + HttpServletResponse response) throws IOException { /* Step 1: Parse the request. */ @@ -317,14 +316,13 @@ public class ExoneraTorServlet extends HttpServlet { /* Helper methods for writing the response. */ - private void writeHeader(PrintWriter out, ResourceBundle rb, String langStr) - throws IOException { + private void writeHeader(PrintWriter out, ResourceBundle rb, String langStr) { out.printf(" <div class=\"container\">\n"); } private void writeForm(PrintWriter out, ResourceBundle rb, String relayIp, boolean relayIpHasError, String timestampStr, - boolean timestampHasError, String langStr) throws IOException { + boolean timestampHasError, String langStr) { String ipValue = ""; if (relayIp != null && relayIp.length() > 0) { if (relayIp.contains(":")) { @@ -374,7 +372,7 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeSummaryUnableToConnectToBackend(PrintWriter out, - ResourceBundle rb) throws IOException { + ResourceBundle rb) { String contactLink = "<a href=\"https://www.torproject.org/about/contact\">" + rb.getString("summary.serverproblem.dbempty.body.link") @@ -386,8 +384,7 @@ public class ExoneraTorServlet extends HttpServlet { contactLink); } - private void writeSummaryNoData(PrintWriter out, ResourceBundle rb) - throws IOException { + private void writeSummaryNoData(PrintWriter out, ResourceBundle rb) { String contactLink = "<a href=\"https://www.torproject.org/about/contact\">" + rb.getString("summary.serverproblem.dbempty.body.link") @@ -399,16 +396,14 @@ public class ExoneraTorServlet extends HttpServlet { contactLink); } - private void writeSummaryNoTimestamp(PrintWriter out, ResourceBundle rb) - throws IOException { + private void writeSummaryNoTimestamp(PrintWriter out, ResourceBundle rb) { this.writeSummary(out, rb.getString("summary.heading"), "panel-danger", rb.getString("summary.invalidparams.notimestamp.title"), null, rb.getString("summary.invalidparams.notimestamp.body")); } - private void writeSummaryNoIp(PrintWriter out, ResourceBundle rb) - throws IOException { + private void writeSummaryNoIp(PrintWriter out, ResourceBundle rb) { this.writeSummary(out, rb.getString("summary.heading"), "panel-danger", rb.getString("summary.invalidparams.noip.title"), null, rb.getString("summary.invalidparams.noip.body")); @@ -416,7 +411,7 @@ public class ExoneraTorServlet extends HttpServlet { private void writeSummaryTimestampOutsideRange(PrintWriter out, ResourceBundle rb, String timestampStr, String firstDate, - String lastDate) throws IOException { + String lastDate) { this.writeSummary(out, rb.getString("summary.heading"), "panel-danger", rb.getString("summary.invalidparams.timestamprange.title"), null, @@ -425,7 +420,7 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeSummaryInvalidIp(PrintWriter out, ResourceBundle rb, - String ipParameter) throws IOException { + String ipParameter) { String escapedIpParameter = ipParameter.length() > 40 ? StringEscapeUtils.escapeHtml4(ipParameter.substring(0, 40)) + "[...]" : StringEscapeUtils.escapeHtml4(ipParameter); @@ -437,7 +432,7 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeSummaryInvalidTimestamp(PrintWriter out, - ResourceBundle rb, String timestampParameter) throws IOException { + ResourceBundle rb, String timestampParameter) { String escapedTimestampParameter = timestampParameter.length() > 20 ? StringEscapeUtils.escapeHtml4(timestampParameter .substring(0, 20)) + "[...]" @@ -450,14 +445,14 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeSummaryTimestampTooRecent(PrintWriter out, - ResourceBundle rb) throws IOException { + ResourceBundle rb) { this.writeSummary(out, rb.getString("summary.heading"), "panel-danger", rb.getString("summary.invalidparams.timestamptoorecent.title"), null, rb.getString("summary.invalidparams.timestamptoorecent.body")); } private void writeSummaryNoDataForThisInterval(PrintWriter out, - ResourceBundle rb) throws IOException { + ResourceBundle rb) { String contactLink = "<a href=\"https://www.torproject.org/about/contact\">" + rb.getString("summary.serverproblem.dbempty.body.link") @@ -471,7 +466,7 @@ public class ExoneraTorServlet extends HttpServlet { void writeSummaryAddressesInSameNetwork(PrintWriter out, ResourceBundle rb, String relayIp, String timestampStr, String langStr, - List<String> addressesInSameNetwork) throws IOException { + List<String> addressesInSameNetwork) { Object[][] panelItems = new Object[addressesInSameNetwork.size()][]; for (int i = 0; i < addressesInSameNetwork.size(); i++) { String addressInSameNetwork = addressesInSameNetwork.get(i); @@ -497,7 +492,7 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeSummaryPositive(PrintWriter out, ResourceBundle rb, - String relayIp, String timestampStr) throws IOException { + String relayIp, String timestampStr) { String formattedRelayIp = relayIp.contains(":") ? "[" + relayIp + "]" : relayIp; this.writeSummary(out, rb.getString("summary.heading"), @@ -507,7 +502,7 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeSummaryNegative(PrintWriter out, ResourceBundle rb, - String relayIp, String timestampStr) throws IOException { + String relayIp, String timestampStr) { String formattedRelayIp = relayIp.contains(":") ? "[" + relayIp + "]" : relayIp; this.writeSummary(out, rb.getString("summary.heading"), @@ -518,8 +513,7 @@ public class ExoneraTorServlet extends HttpServlet { private void writeSummary(PrintWriter out, String heading, String panelContext, String panelTitle, Object[][] panelItems, - String panelBodyTemplate, Object... panelBodyArgs) - throws IOException { + String panelBodyTemplate, Object... panelBodyArgs) { out.printf(" <div class=\"row\">\n" + " <div class=\"col-xs-12\">\n" + " <h2>%s</h2>\n" @@ -545,8 +539,7 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeTechnicalDetails(PrintWriter out, ResourceBundle rb, - String relayIp, String timestampStr, List<String[]> tableRows) - throws IOException { + String relayIp, String timestampStr, List<String[]> tableRows) { String formattedRelayIp = relayIp.contains(":") ? "[" + relayIp + "]" : relayIp; out.printf(" <div class=\"row\">\n" @@ -608,8 +601,7 @@ public class ExoneraTorServlet extends HttpServlet { } private void writePermanentLink(PrintWriter out, ResourceBundle rb, - String requestUrl, String relayIp, String timestampStr, String langStr) - throws IOException { + String requestUrl, String relayIp, String timestampStr, String langStr) { String encodedAddress = relayIp.contains(":") ? "[" + relayIp.replaceAll(":", "%3A") + "]" : relayIp; out.printf(" <div class=\"row\">\n" @@ -624,8 +616,7 @@ public class ExoneraTorServlet extends HttpServlet { } private void writeFooter(PrintWriter out, ResourceBundle rb, - String requestUrl, String relayIp, String timestampStr) - throws IOException { + String requestUrl, String relayIp, String timestampStr) { out.printf(" </div>\n" + " <div class=\"container\">\n" + " <div class=\"row\">\n" diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java index a677585..ef12f00 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java @@ -30,7 +30,6 @@ import java.util.regex.Pattern; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -62,8 +61,7 @@ public class QueryServlet extends HttpServlet { @Override public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, - ServletException { + HttpServletResponse response) throws IOException { try { /* Parse ip parameter. */ String ipParameter = request.getParameter("ip");

1 0

[exonerator/release] Use foreach loop.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit 72acf8249323809040c98798020df54039c9a1c5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 14:57:03 2018 +0200 Use foreach loop. --- .../torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java | 3 +-- .../java/org/torproject/metrics/exonerator/ExoneraTorServlet.java | 3 +-- src/main/java/org/torproject/metrics/exonerator/QueryServlet.java | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java index 5e8da87..d27f8d8 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java @@ -282,8 +282,7 @@ public class ExoneraTorDatabaseImporter { int end = orAddress.length() - (orAddress.endsWith("::]") ? 2 : 1); String[] parts = orAddress.substring(start, end).split(":", -1); - for (int i = 0; i < parts.length; i++) { - String part = parts[i]; + for (String part : parts) { if (part.length() == 0) { addressHex.append("x"); } else if (part.length() <= 4) { diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index 4c85480..4a99e19 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -269,8 +269,7 @@ public class ExoneraTorServlet extends HttpServlet { int end = ipParameter.length() - (ipParameter.endsWith("::") ? 1 : 0); String[] parts = ipParameter.substring(start, end).split(":", -1); - for (int i = 0; i < parts.length; i++) { - String part = parts[i]; + for (String part : parts) { if (part.length() == 0) { addressHex.append("x"); } else if (part.length() <= 4) { diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java index ef12f00..77892f0 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java @@ -143,8 +143,7 @@ public class QueryServlet extends HttpServlet { int end = ipParameter.length() - (ipParameter.endsWith("::") ? 1 : 0); String[] parts = ipParameter.substring(start, end).split(":", -1); - for (int i = 0; i < parts.length; i++) { - String part = parts[i]; + for (String part : parts) { if (part.length() == 0) { addressHex.append("x"); } else if (part.length() <= 4) { @@ -189,8 +188,7 @@ public class QueryServlet extends HttpServlet { int start = relayIp.startsWith("::") ? 1 : 0; int end = relayIp.length() - (relayIp.endsWith("::") ? 1 : 0); String[] parts = relayIp.substring(start, end).split(":", -1); - for (int i = 0; i < parts.length; i++) { - String part = parts[i]; + for (String part : parts) { if (part.length() == 0) { addressHex.append("x"); } else if (part.length() <= 4) {

1 0

[exonerator/release] Replace Collections.sort with List.sort.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit 40cac45b257d368dbdb1cdc9cc792f678357428a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:25:34 2018 +0200 Replace Collections.sort with List.sort. --- .../torproject/metrics/exonerator/QueryServlet.java | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java index 77892f0..556d8d3 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java @@ -20,7 +20,6 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Calendar; -import java.util.Collections; import java.util.List; import java.util.SortedSet; import java.util.TimeZone; @@ -356,16 +355,15 @@ public class QueryServlet extends HttpServlet { } } if (!matches.isEmpty()) { - Collections.sort(matches, - (m1, m2) -> { - if (m1 == m2) { - return 0; - } else if (!m1.timestamp.equals(m2.timestamp)) { - return m1.timestamp.compareTo(m2.timestamp); - } else { - return m1.fingerprint.compareTo(m2.fingerprint); - } - }); + matches.sort((m1, m2) -> { + if (m1 == m2) { + return 0; + } else if (!m1.timestamp.equals(m2.timestamp)) { + return m1.timestamp.compareTo(m2.timestamp); + } else { + return m1.fingerprint.compareTo(m2.fingerprint); + } + }); response.matches = matches.toArray(new QueryResponse.Match[0]); } else { List<String> nearbyAddresses = new ArrayList<>();

1 0

[exonerator/release] Use chained String.append calls.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit 2cd8b3f32925104c27542bc9e00cee6d95b6804e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:46:31 2018 +0200 Use chained String.append calls. --- .../org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java | 2 +- src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java index 065b986..ab4f094 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java @@ -145,7 +145,7 @@ public class ExoneraTorDatabaseImporter { } BufferedWriter bw = new BufferedWriter(new FileWriter( "exonerator-lock")); - bw.append(String.valueOf(System.currentTimeMillis()) + "\n"); + bw.append(String.valueOf(System.currentTimeMillis())).append("\n"); bw.close(); } catch (IOException e) { logger.warn("Could not create 'exonerator-lock' file. Exiting."); diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index 4a99e19..8786261 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -110,7 +110,7 @@ public class ExoneraTorServlet extends HttpServlet { StringBuilder sb = new StringBuilder(); int writtenAddresses = 0; for (String address : match.addresses) { - sb.append((writtenAddresses++ > 0 ? ", " : "") + address); + sb.append(writtenAddresses++ > 0 ? ", " : "").append(address); } String[] statusEntry = new String[]{match.timestamp, sb.toString(), match.fingerprint, match.nickname,

1 0

[exonerator/release] Replace while with for loop.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit f66289e20c7912c8a8f902f6cf98d328ffe46d06 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:32:09 2018 +0200 Replace while with for loop. --- .../torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java index d27f8d8..065b986 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java @@ -32,7 +32,6 @@ import java.sql.Types; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.SortedMap; @@ -209,10 +208,8 @@ public class ExoneraTorDatabaseImporter { DescriptorSourceFactory.createDescriptorReader(); descriptorReader.setMaxDescriptorsInQueue(20); descriptorReader.setExcludedFiles(lastImportHistory); - Iterator<Descriptor> descriptors = descriptorReader.readDescriptors( - new File(importDirString)).iterator(); - while (descriptors.hasNext()) { - Descriptor descriptor = descriptors.next(); + for (Descriptor descriptor : descriptorReader.readDescriptors( + new File(importDirString))) { if (descriptor instanceof RelayNetworkStatusConsensus) { parseConsensus((RelayNetworkStatusConsensus) descriptor); } else if (descriptor instanceof ExitList) {

1 0

[exonerator/master] Fix two Checkstyle issues.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit f1654b3e818be9c9531b8e57dea6263a8997adaf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 28 09:07:58 2018 +0200 Fix two Checkstyle issues. --- .../java/org/torproject/metrics/exonerator/QueryResponse.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java index b40b65f..e920ecf 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java @@ -37,10 +37,14 @@ public class QueryResponse { /** Version of this response format. */ String version = VERSION; - /** Query IP address passed in the request; never {@code null}. */ + /** + * Query IP address passed in the request; never {@code null}. + */ String queryAddress; - /** Query date passed in the request; never {@code null}. */ + /** + * Query date passed in the request; never {@code null}. + */ String queryDate; /** ISO-formatted valid-after time of the first status contained in the

1 0

[exonerator/master] Fix links to IP addresses in same /24.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit b8dbfe1ac93e6e0594efa6b89b390681cd37cb6b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 27 15:39:29 2018 +0200 Fix links to IP addresses in same /24. Fixes #27266. --- CHANGELOG.md | 6 ++++++ .../torproject/metrics/exonerator/ExoneraTorServlet.java | 14 +++++++------- .../metrics/exonerator/ExoneraTorServletTest.java | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dce2f3a..44a3631 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 3.0.1 - 2018-08-?? + + * Medium changes + - Fix links to IP addresses in same /24. + + # Changes in version 3.0.0 - 2018-08-13 * Major changes diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index bd593cc..5909f26 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -215,7 +215,7 @@ public class ExoneraTorServlet extends HttpServlet { statusEntries); } else if (addressesInSameNetwork != null && !addressesInSameNetwork.isEmpty()) { - this.writeSummaryAddressesInSameNetwork(out, rb, relayIp, + this.writeSummaryAddressesInSameNetwork(out, rb, requestUrl, relayIp, requestedDate.asString, langStr, addressesInSameNetwork); } else { this.writeSummaryNegative(out, rb, relayIp, requestedDate.asString); @@ -464,8 +464,8 @@ public class ExoneraTorServlet extends HttpServlet { } void writeSummaryAddressesInSameNetwork(PrintWriter out, - ResourceBundle rb, String relayIp, String timestampStr, String langStr, - List<String> addressesInSameNetwork) { + ResourceBundle rb, String requestUrl, String relayIp, String timestampStr, + String langStr, List<String> addressesInSameNetwork) { Object[][] panelItems = new Object[addressesInSameNetwork.size()][]; for (int i = 0; i < addressesInSameNetwork.size(); i++) { String addressInSameNetwork = addressesInSameNetwork.get(i); @@ -473,12 +473,12 @@ public class ExoneraTorServlet extends HttpServlet { String address; if (addressInSameNetwork.contains(":")) { address = addressInSameNetwork.replaceAll("[\\[\\]]", ""); - link = String.format("/?ip=[%s]&timestamp=%s&lang=%s", - address.replaceAll(":", "%3A"), timestampStr, langStr); + link = String.format("%s?ip=[%s]&timestamp=%s&lang=%s", + requestUrl, address.replaceAll(":", "%3A"), timestampStr, langStr); address = "[" + address + "]"; } else { - link = String.format("/?ip=%s&timestamp=%s&lang=%s", - addressInSameNetwork, timestampStr, langStr); + link = String.format("%s?ip=%s&timestamp=%s&lang=%s", + requestUrl, addressInSameNetwork, timestampStr, langStr); address = addressInSameNetwork; } panelItems[i] = new Object[] { link, address }; diff --git a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java index 34dfd42..1ede590 100644 --- a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java @@ -49,7 +49,7 @@ public class ExoneraTorServletTest { for (QueryResponse qr : qrs) { StringWriter sw = new StringWriter(); es.writeSummaryAddressesInSameNetwork(new PrintWriter(sw), rb, - qr.queryAddress, qr.queryDate, "en", + "http://localhost:8080/", qr.queryAddress, qr.queryDate, "en", Arrays.asList(qr.nearbyAddresses)); String errorMsg = "Test data:" + QueryResponse.toJson(qr) + "\nresult:\n" + sw.toString();

1 0

[exonerator/master] Prepare for 3.0.1 release.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit 6ae8035f4f60f516d1d40c22ad753516c3cd3c16 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 28 09:08:38 2018 +0200 Prepare for 3.0.1 release. --- CERT | 18 +++++++++--------- CHANGELOG.md | 6 +++++- build.xml | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CERT b/CERT index 61fa7c6..b90b397 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIENNGkczANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIELle0dTANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTgw -NTIzMTUxNDU2WhcNMTgwODIxMTUxNDU2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +ODI4MDcwNjM2WhcNMTgxMTI2MDcwNjM2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAJtEQ -B2AVpVtjTGU7uujUtEjSn1ICv7QLW/37TmHn+m1SWvXOVlSG81eb5JwX449Pn3w5 -K1Bx0JJmJ6Kec2kHtoR1r5/DUlTMtRqKQ5ZHQbvYMx+Ifq8TRALHjcw8p5Vw+gep -0zYbSQycklzFaFqLB8Cus0ICb+UY54HTddpezQ3IXS/vc4Vy07ocm8rUCz1s8L/r -ehTOxSym7G7+kcRzNplFOLL5iO8o6uHPyLR1TIAIXa0XZ41ogNl2q+6CvXG+UI/j -qkzSXD6FJK1Px2nxNFIe/w9NL+chSytIGnV3CImyiORuV+1OxMglyQspSGEbl1XP -OfiTEYHnp12BYMeRyw== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAkXZs +3T3GTkZ+EGvZG5puzKdgZiSsLgIy25xdWsIx147AIZEJFKjEAtbu0osMpkTa96B6 +a+BHf7PTjQUuH3YOEmeW9ab8pwu5SRijCq2qkuvjjSLBcJzWnalcKDYYvoQte1// +Di8JqpRXCw20WY2bldTiafyG80E0RGfiX2I8vbDiPIhjwz9Wox8Q1rw1c9T/vRn9 +pI8FrHgTnDO6R54yD25QSpsj+hC+IDkFKO17vGCIaJrPG5o6th438ijEwJsG+LRB +4zKKKsFTby7UJI3Ag8xolIhsBkRZO2j4Na35i15SZ7QJNj9J5g171z8RyOmyIQbg +q7OXN2iiRIxiIJwoQw== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index 44a3631..0387338 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ -# Changes in version 3.0.1 - 2018-08-?? +# Changes in version 3.0.1 - 2018-08-28 * Medium changes - Fix links to IP addresses in same /24. + * Minor changes + - Make several improvements to the code, none of which should + affect operation. + # Changes in version 3.0.0 - 2018-08-13 diff --git a/build.xml b/build.xml index eaa2a94..6dc86d9 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="ExoneraTor API Documentation"/> <property name="implementation-title" value="ExoneraTor" /> - <property name="release.version" value="3.0.0-dev" /> + <property name="release.version" value="3.0.1" /> <property name="metricslibversion" value="2.4.0" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[exonerator/master] Bump version to 3.0.1-dev.
by karsten＠torproject.org 28 Aug '18

28 Aug '18

commit da3eb1fa37921959c774532e5e7a2a6ae0850e39 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 28 09:28:02 2018 +0200 Bump version to 3.0.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 6dc86d9..1c7c6ca 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="ExoneraTor API Documentation"/> <property name="implementation-title" value="ExoneraTor" /> - <property name="release.version" value="3.0.1" /> + <property name="release.version" value="3.0.1-dev" /> <property name="metricslibversion" value="2.4.0" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2018