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

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 15 Nov '17

15 Nov '17

commit 000c644b39ced7f1b7372f6d89f6730e81461eee Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 15 10:47:03 2017 +0000 Update translations for tor-launcher-network-settings_completed --- da/network-settings.dtd | 61 ++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index 28510322c..a26be28e6 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor netværksindstillinger"> +<!ENTITY torsettings.wizard.title.default "Opret forbindelse til Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor netværksindstillinger"> +<!ENTITY torsettings.wizard.title.connecting "Etablerer en forbindelse">  <!ENTITY torlauncher.localePicker.title "Tor Browser sprog"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Før du opretter forbindelse til Tor-netværket, skal du indtaste information om denne computers internetforbindelse."> - -<!ENTITY torSettings.yes "Ja"> -<!ENTITY torSettings.no "Nej"> - -<!ENTITY torSettings.firstQuestion "Hvilke af de følgende beskriver bedst din situation?"> -<!ENTITY torSettings.configurePrompt1 "Denne computers internetforbindelse er censureret eller er etableret gennem en proxy."> -<!ENTITY torSettings.configurePrompt2 "Jeg skal konfigurerer bro- og lokal proxyindstillinger før jeg opretter forbindelse til Tor-netværket."> +<!ENTITY torSettings.connectPrompt "Klik på “Opret forbindelse” for at oprette forbindelse til Tor."> +<!ENTITY torSettings.configurePrompt "Klik på “Konfigurer” for at justere netværksindstillinger, hvis du befinder dig i et land som censurerer Tor (såsom kina, iran og syrien) eller hvis du har oprettet forbindelse fra et privat netværk som kræver en proxy."> <!ENTITY torSettings.configure "Indstil"> -<!ENTITY torSettings.connectPrompt2 "Jeg vil foretage en direkte forbindelse til Tor-netværket."> -<!ENTITY torSettings.connectPrompt3 "Dette vil virker i de fleste situationer"> <!ENTITY torSettings.connect "Tilslut"> -<!ENTITY torSettings.proxyPageTitle "Lokale proxy indstillinger"> -<!ENTITY torSettings.proxyQuestion "Behøver denne computer bruge en lokal proxy for at tilgå internettet?"> - -<!ENTITY torSettings.proxyExplanation1 "I de fleste tilfælde er en lokal proxy ikke nødvendig, men det kan være krævet når der oprettes forbindelse gennem netværket i en virksomhed, skole eller universitet."> -<!ENTITY torSettings.proxyExplanation2 "Hvis du ikke er sikker på hvad du skal svare til dette spørgsmål, så kig i internetindstillingerne i en anden browser og tjek dit systems netværksindstillinger, for at se hvorvidt det er nødvendigt med en lokal proxy."> -<!ENTITY torSettings.enterProxy "Indtast proxy-indstillinger."> -<!ENTITY torSettings.bridgePageTitle "Tor bridge konfiguration"> -<!ENTITY torSettings.bridgeQuestion "Blokerer eller censurerer din internetudbyder (ISP) forbindelser til Tor-netværket?"> -<!ENTITY torSettings.bridgeExplanation1 "Hvis du ikke er sikker på hvad du skal svare til dette spørgsmål, så vælg Nej (hvis du ikke er i stand til at oprette forbindelse til Tor-netværket gennem en bro, så kan du tilføje en senere)."> -<!ENTITY torSettings.bridgeExplanation2 "Hvis du vælger Ja, så vil du blive spurgt om at konfigurere Tor-broer, hvilket er ulistede relæer som gøre det svære at blokere forbindelser til Tor-netværket."> -<!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruge det tildelte sæt broer eller du kan hente og indtaste et skræddersyet sæt broer."> -  <!ENTITY torsettings.startingTor "Venter på at Tor starter..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Valgfri"> -<!ENTITY torsettings.useProxy.checkbox "Denne computer skal bruge en lokal proxy for at tilgå internettet"> +<!ENTITY torsettings.useProxy.checkbox "Jeg bruger en proxy til at oprette forbindelse til internettet"> <!ENTITY torsettings.useProxy.type "Proxy type:"> +<!ENTITY torsettings.useProxy.type.placeholder "vælg en proxytype"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresse eller værtsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,22 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne computer går gennem en firewall som kun tillader forbindelse til specifikke porte"> <!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:"> -<!ENTITY torsettings.useBridges.checkbox "Min internetudbyder (ISP) blokerer forbindelser til Tor-netværket"> -<!ENTITY torsettings.useBridges.default "Forbind med tildelte broer"> -<!ENTITY torsettings.useBridges.note "Hver type bro bruger forskellige metoder for at undgå censurering.  Hvis en bro ikke virker, så prøv igen med en anden."> -<!ENTITY torsettings.useBridges.type "Transporttype:"> -<!ENTITY torsettings.useBridges.custom "Indtast skræddersyede broer"> -<!ENTITY torsettings.useBridges.label "Indtast et eller flere bro-relæer (et pr. linje)"> -<!ENTITY torsettings.useBridges.placeholder "type adresse:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> +<!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> +<!ENTITY torsettings.useBridges.default.placeholder "vælg en bro"> +<!ENTITY torsettings.useBridges.custom "Formidl en bro jeg kender"> +<!ENTITY torsettings.useBridges.label "Indtast broinformation fra en betroet kilde."> +<!ENTITY torsettings.useBridges.placeholder "skriv adresse:port (én pr. linje)"> <!ENTITY torsettings.copyLog "Kopier Tor loggen til udklipsholderen"> + +<!ENTITY torsettings.proxyHelpTitle "Hjælp til proxy"> +<!ENTITY torsettings.proxyHelp1 "Det er nødvendigt med en lokal proxy når der oprettes forbindelse gennem et firma-, skole- eller universitetsnetværk. Hvis du i tvivl om hvordan du skal svarer på sprøgsmålet, så kig i internetindstillingerne i en anden browser eller tjek dit systems netværksindstillinger, for at se om det er nødvendigt med en proxy."> + <!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> -<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke kan oprette forbindelse til Tor-netværket er det muligt at din internetudbyder (ISP) eller anden myndighed blokerer Tor.   Det er ofte muligt at omgå problemet ved at bruge Tor-broer. En bro er et relæ som ikke er på den offentliggjorte liste og som derfor er sværere at blokkere."> -<!ENTITY torsettings.bridgeHelp1B "Du kan bruge de prækonfigurerede, tildelte sæt af broadresser eller du kan få fat i et tilpasset sæt af adresser, ved at bruge en af disse metoder:"> -<!ENTITY torsettings.bridgeHelp2Heading "Gennem webbet"> -<!ENTITY torsettings.bridgeHelp2 "Brug en browser og besøg https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske e-mailservice"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send e-mail til bridges(a)torproject.org med linjen "get bridges" som det eneste i beskedteksten.  Men, for at gøre det sværere for en angriber at få kendskab til en masse broadresser, skal du sende din forespørgsel fra en af de følgende e-mailudbydere (i foretrukket rækkefølge):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com eller https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig e-mail to help(a)rt.torproject.org.  Bemærk venligst at alle e-mails besvares manuelt."> +<!ENTITY torsettings.bridgeHelp1 "Broer er ulistede relæer som gør det sværrer at blokere forbindelser til Tor-netværket.  Hver type bro bruger en anderledes metode for at undgå censur.  Dem med obfs får din netværkstrafik til at ligne tilfældig støj og dem med meek får din netværkstrafik til at se ud som om den er forbundet til tjenesten i stedet for Tor."> +<!ENTITY torsettings.bridgeHelp2 "Pga. den måde bestemte lande prøver at blokere Tor, vil bestemte broer virke i nogle lande men ikke andre.  Besøg torproject.org/about/contact.html#support hvis du er i tvivl om hvilke broer der virker i dit land."> + + +<!ENTITY torprogress.pleaseWait "Vent venligst mens der etableres forbindelse til Tor-netværket.  Det kan tage flere minutter.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 15 Nov '17

15 Nov '17

commit 82fa958838e7dc76279357e087136ef168b5d955 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 15 10:46:57 2017 +0000 Update translations for tor-launcher-network-settings --- da/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index 1a86282e1..a26be28e6 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klik på “Opret forbindelse” for at oprette forbindelse til Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Klik på “Konfigurer” for at justere netværksindstillinger, hvis du befinder dig i et land som censurerer Tor (såsom kina, iran og syrien) eller hvis du har oprettet forbindelse fra et privat netværk som kræver en proxy."> <!ENTITY torSettings.configure "Indstil"> <!ENTITY torSettings.connect "Tilslut"> @@ -48,11 +48,11 @@ <!ENTITY torsettings.copyLog "Kopier Tor loggen til udklipsholderen"> <!ENTITY torsettings.proxyHelpTitle "Hjælp til proxy"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelp1 "Det er nødvendigt med en lokal proxy når der oprettes forbindelse gennem et firma-, skole- eller universitetsnetværk. Hvis du i tvivl om hvordan du skal svarer på sprøgsmålet, så kig i internetindstillingerne i en anden browser eller tjek dit systems netværksindstillinger, for at se om det er nødvendigt med en proxy."> <!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Broer er ulistede relæer som gør det sværrer at blokere forbindelser til Tor-netværket.  Hver type bro bruger en anderledes metode for at undgå censur.  Dem med obfs får din netværkstrafik til at ligne tilfældig støj og dem med meek får din netværkstrafik til at se ud som om den er forbundet til tjenesten i stedet for Tor."> +<!ENTITY torsettings.bridgeHelp2 "Pga. den måde bestemte lande prøver at blokere Tor, vil bestemte broer virke i nogle lande men ikke andre.  Besøg torproject.org/about/contact.html#support hvis du er i tvivl om hvilke broer der virker i dit land.">  <!ENTITY torprogress.pleaseWait "Vent venligst mens der etableres forbindelse til Tor-netværket.  Det kan tage flere minutter.">

1 0

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

15 Nov '17

commit 5eca4ad20d16cafae224585de36ea65edc88cc0d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 15 09:50:49 2017 +0000 Update translations for tor-browser-manual --- ru/ru.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ru/ru.po b/ru/ru.po index 439220131..0230fefd1 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -14,12 +14,13 @@ # Bahaa Abu Diak <bahanter(a)gmail.com>, 2017 # Татьяна Ч (tanikche) <tanikche(a)icloud.com>, 2017 # Roberto Brigante <robvar666(a)gmail.com>, 2017 +# Антон Толмачев <a.tolmachev(a)richart-consalt.ru>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Roberto Brigante <robvar666(a)gmail.com>, 2017\n" +"Last-Translator: Антон Толмачев <a.tolmachev(a)richart-consalt.ru>, 2017\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1564,6 +1565,8 @@ msgid "" "Wait for the update to download and install, then restart Tor Browser. You " "will now be running the latest version." msgstr "" +"Дождитесь завершения загрузки и установки обновления, затем перезапустите " +"Tor. Будете работать с самой свежей версией, ваш КЭП" #: updating.page:58 msgid "Updating Tor Browser manually" @@ -1581,6 +1584,8 @@ msgid "" "(see the <link xref=\"uninstalling\">Uninstalling</link> section for more " "information)." msgstr "" +"Удалите Tor Browser из вашей системы удалив каталог, в котором лежит браузер" +" (Shift+Del) (см. 1Uninstalling2 для доп. информации)." #: updating.page:74 msgid ""

1 0

[metrics-web/master] Update Onionoo's host_name field specification.
by karsten＠torproject.org 15 Nov '17

15 Nov '17

commit 5451a6f895a879c635eec3a862e64f3572099411 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 15 09:24:31 2017 +0100 Update Onionoo's host_name field specification. Related to #23522. --- website/src/main/resources/web/WEB-INF/onionoo.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp index 37a7ea7..0ed4f6c 100644 --- a/website/src/main/resources/web/WEB-INF/onionoo.jsp +++ b/website/src/main/resources/web/WEB-INF/onionoo.jsp @@ -1240,11 +1240,11 @@ change in the future. <a href="#details_relay_host_name" class="anchor">#</a> <p> Host name as found in a reverse DNS lookup of the -relay IP address. +relay's primary IP address. This field is updated at most once in 12 hours, unless the relay IP address changes. -Omitted if the relay IP address was not looked up or if no lookup request -was successful yet. +Omitted if the relay IP address was not looked up, if no lookup request +was successful yet, or if no A record was found matching the PTR record. </p> </li>

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 14 Nov '17

14 Nov '17

commit f6cacf0280486ffe341a61e0768fa0d32df91924 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 14 22:16:54 2017 +0000 Update translations for tor-launcher-network-settings --- da/network-settings.dtd | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index 6ca365b01..1a86282e1 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor netværksindstillinger"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Opret forbindelse til Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor netværksindstillinger"> +<!ENTITY torsettings.wizard.title.connecting "Etablerer en forbindelse">  <!ENTITY torlauncher.localePicker.title "Tor Browser sprog"> @@ -9,7 +9,7 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.connectPrompt "Klik på “Opret forbindelse” for at oprette forbindelse til Tor."> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Indstil"> <!ENTITY torSettings.connect "Tilslut"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Valgfri"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Jeg bruger en proxy til at oprette forbindelse til internettet"> <!ENTITY torsettings.useProxy.type "Proxy type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "vælg en proxytype"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresse eller værtsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,16 +38,16 @@ <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne computer går gennem en firewall som kun tillader forbindelse til specifikke porte"> <!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> +<!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> +<!ENTITY torsettings.useBridges.default.placeholder "vælg en bro"> +<!ENTITY torsettings.useBridges.custom "Formidl en bro jeg kender"> +<!ENTITY torsettings.useBridges.label "Indtast broinformation fra en betroet kilde."> +<!ENTITY torsettings.useBridges.placeholder "skriv adresse:port (én pr. linje)"> <!ENTITY torsettings.copyLog "Kopier Tor loggen til udklipsholderen"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelpTitle "Hjælp til proxy"> <!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> <!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> @@ -55,4 +55,4 @@ <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Vent venligst mens der etableres forbindelse til Tor-netværket.  Det kan tage flere minutter.">

1 0

[exonerator/master] Bump version to 2.0.0.
by karsten＠torproject.org 14 Nov '17

14 Nov '17

commit f921654bc68dcee6fbb943e3208e52c5c90faae9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 14 21:32:19 2017 +0100 Bump version to 2.0.0. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index ec861b5..c3bc0df 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="1.0.0-dev" /> + <property name="release.version" value="2.0.0" /> <property name="metricslibversion" value="2.1.1" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[tor/master] Remove remove_file_if_very_old() -- nothing calls it.
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit bf8a7201cea0dcd4da91cd67015bbdabc38c395a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 14 15:33:58 2017 -0500 Remove remove_file_if_very_old() -- nothing calls it. --- src/or/config.c | 22 ---------------------- src/or/connection.h | 1 - 2 files changed, 23 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 23d67ca42..b0a140d23 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7963,28 +7963,6 @@ write_to_data_subdir(const char* subdir, const char* fname, return return_val; } -/** Given a file name check to see whether the file exists but has not been - * modified for a very long time. If so, remove it. */ -void -remove_file_if_very_old(const char *fname, time_t now) -{ -#define VERY_OLD_FILE_AGE (28*24*60*60) - struct stat st; - - log_debug(LD_FS, "stat()ing %s", fname); - if (stat(sandbox_intern_string(fname), &st)==0 && - st.st_mtime < now-VERY_OLD_FILE_AGE) { - char buf[ISO_TIME_LEN+1]; - format_local_iso_time(buf, st.st_mtime); - log_notice(LD_GENERAL, "Obsolete file %s hasn't been modified since %s. " - "Removing it.", fname, buf); - if (unlink(fname) != 0) { - log_warn(LD_FS, "Failed to unlink %s: %s", - fname, strerror(errno)); - } - } -} - /** Return a smartlist of ports that must be forwarded by * tor-fw-helper. The smartlist contains the ports in a string format * that is understandable by tor-fw-helper. */ diff --git a/src/or/connection.h b/src/or/connection.h index 450229ce8..1d41a3c4f 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -245,7 +245,6 @@ char *alloc_http_authenticator(const char *authenticator); void assert_connection_ok(connection_t *conn, time_t now); int connection_or_nonopen_was_started_here(or_connection_t *conn); void connection_dump_buffer_mem_stats(int severity); -void remove_file_if_very_old(const char *fname, time_t now); void clock_skew_warning(const connection_t *conn, long apparent_skew, int trusted, log_domain_mask_t domain,

1 0

[exonerator/master] Make database credentials command line configurable.
by karsten＠torproject.org 14 Nov '17

14 Nov '17

commit 66cdd7eaefd99c737922205d78433c26c9c08697 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Nov 2 12:48:01 2017 +0000 Make database credentials command line configurable. The system properties to set are 'exonerator.db.user' and 'exonerator.db.pw', e.g., '-Dexonerator.db.user=dummyuser -Dexonerator.db.pw=dummypassword'. --- src/main/resources/jetty.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/resources/jetty.xml b/src/main/resources/jetty.xml index ba15c61..3870fa7 100644 --- a/src/main/resources/jetty.xml +++ b/src/main/resources/jetty.xml @@ -28,8 +28,12 @@ <Arg>jdbc/exonerator</Arg> <Arg> <New class="org.postgresql.ds.PGPoolingDataSource"> - <Set name="user">dummydatabaseuser</Set> - <Set name="password">dummypassword</Set> + <Set name="user"> + <SystemProperty name="exonerator.db.user" /> + </Set> + <Set name="password"> + <SystemProperty name="exonerator.db.pw" /> + </Set> <Set name="databaseName">exonerator</Set> <Set name="serverName">localhost</Set> <Set name="dataSourceName">exonerator</Set>

1 0

[exonerator/master] Prevent NPE and unclosed connections.
by karsten＠torproject.org 14 Nov '17

14 Nov '17

commit 7817a7cc2a88671882fafabff162f262adc650fa Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Nov 2 12:48:00 2017 +0000 Prevent NPE and unclosed connections. --- .../org/torproject/exonerator/QueryServlet.java | 133 +++++++++++---------- 1 file changed, 69 insertions(+), 64 deletions(-) diff --git a/src/main/java/org/torproject/exonerator/QueryServlet.java b/src/main/java/org/torproject/exonerator/QueryServlet.java index 893a7b9..3005302 100644 --- a/src/main/java/org/torproject/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/exonerator/QueryServlet.java @@ -13,6 +13,7 @@ import java.sql.CallableStatement; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -245,77 +246,82 @@ public class QueryServlet extends HttpServlet { SortedSet<Long> allValidAfters = new TreeSet<>(); List<QueryResponse.Match> matches = new ArrayList<>(); SortedSet<String> allAddresses = new TreeSet<>(); - try { - final long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); - CallableStatement cs = conn.prepareCall(String.format( + final long requestedConnection = System.currentTimeMillis(); + Calendar utcCalendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + try (Connection conn = this.ds.getConnection()) { + try (CallableStatement cs = conn.prepareCall(String.format( "{call search_by_address%s_date(?, ?)}", - relayIp.contains(":") ? 48 : 24)); - cs.setString(1, address24Or48Hex); - Calendar utcCalendar = Calendar.getInstance( - TimeZone.getTimeZone("UTC")); - cs.setDate(2, new java.sql.Date(timestamp), utcCalendar); - ResultSet rs = cs.executeQuery(); - while (rs.next()) { - long validafter = rs.getTimestamp(2, utcCalendar).getTime(); - allValidAfters.add(validafter); - byte[] rawstatusentry = rs.getBytes(1); - if (null == rawstatusentry) { - continue; - } - SortedSet<String> addresses = new TreeSet<>(); - SortedSet<String> addressesHex = new TreeSet<>(); - String nickname = null; - Boolean exit = null; - for (String line : new String(rawstatusentry).split("\n")) { - if (line.startsWith("r ")) { - String[] parts = line.split(" "); - nickname = parts[1]; - addresses.add(parts[6]); - addressesHex.add(this.convertIpV4ToHex(parts[6])); - } else if (line.startsWith("a ")) { - String address = line.substring("a ".length(), - line.lastIndexOf(":")); - addresses.add(address); - String orAddressHex = !address.contains(":") - ? this.convertIpV4ToHex(address) - : this.convertIpV6ToHex(address); - addressesHex.add(orAddressHex); - } else if (line.startsWith("p ")) { - exit = !line.equals("p reject 1-65535"); + relayIp.contains(":") ? 48 : 24))) { + cs.setString(1, address24Or48Hex); + cs.setDate(2, new java.sql.Date(timestamp), utcCalendar); + try (ResultSet rs = cs.executeQuery()) { + while (rs.next()) { + Timestamp ts = rs.getTimestamp(2, utcCalendar); + if (null == ts) { + continue; + } + long validafter = ts.getTime(); + allValidAfters.add(validafter); + byte[] rawstatusentry = rs.getBytes(1); + if (null == rawstatusentry) { + continue; + } + SortedSet<String> addresses = new TreeSet<>(); + SortedSet<String> addressesHex = new TreeSet<>(); + String nickname = null; + Boolean exit = null; + for (String line : new String(rawstatusentry).split("\n")) { + if (line.startsWith("r ")) { + String[] parts = line.split(" "); + nickname = parts[1]; + addresses.add(parts[6]); + addressesHex.add(this.convertIpV4ToHex(parts[6])); + } else if (line.startsWith("a ")) { + String address = line.substring("a ".length(), + line.lastIndexOf(":")); + addresses.add(address); + String orAddressHex = !address.contains(":") + ? this.convertIpV4ToHex(address) + : this.convertIpV6ToHex(address); + addressesHex.add(orAddressHex); + } else if (line.startsWith("p ")) { + exit = !line.equals("p reject 1-65535"); + } + } + String exitaddress = rs.getString(4); + if (exitaddress != null && exitaddress.length() > 0) { + addresses.add(exitaddress); + addressesHex.add(this.convertIpV4ToHex(exitaddress)); + } + allAddresses.addAll(addresses); + if (!addressesHex.contains(addressHex)) { + continue; + } + String validAfterString = validAfterTimeFormat.format(validafter); + String fingerprint = rs.getString(3).toUpperCase(); + QueryResponse.Match match = new QueryResponse.Match(); + match.timestamp = validAfterString; + match.addresses = addresses.toArray(new String[0]); + match.fingerprint = fingerprint; + match.nickname = nickname; + match.exit = exit; + matches.add(match); } + } catch (SQLException e) { + this.logger.warn("Result set error. Returning 'null'.", e); + return null; } - String exitaddress = rs.getString(4); - if (exitaddress != null && exitaddress.length() > 0) { - addresses.add(exitaddress); - addressesHex.add(this.convertIpV4ToHex(exitaddress)); - } - allAddresses.addAll(addresses); - if (!addressesHex.contains(addressHex)) { - continue; - } - String validAfterString = validAfterTimeFormat.format(validafter); - String fingerprint = rs.getString(3).toUpperCase(); - QueryResponse.Match match = new QueryResponse.Match(); - match.timestamp = validAfterString; - match.addresses = addresses.toArray(new String[0]); - match.fingerprint = fingerprint; - match.nickname = nickname; - match.exit = exit; - matches.add(match); + this.logger.info("Returned a database connection to the pool after {}" + + " millis.", System.currentTimeMillis() - requestedConnection); + } catch (SQLException e) { + this.logger.warn("Callable statement error. Returning 'null'.", e); + return null; } - rs.close(); - cs.close(); - conn.close(); - this.logger.info("Returned a database connection to the pool after {}" - + " millis.", System.currentTimeMillis() - requestedConnection); - } catch (SQLException e) { - /* Nothing found. */ + } catch (Throwable e) { // Catch all problems left. this.logger.warn("Database error. Returning 'null'.", e); return null; } - /* Create a query response object. */ QueryResponse response = new QueryResponse(); response.queryAddress = relayIp; response.queryDate = dateFormat.format(timestamp); @@ -352,7 +358,6 @@ public class QueryServlet extends HttpServlet { } } - /* Return the query response. */ return response; } }

1 0

[exonerator/master] Tweak change log for internal release 2.0.0.
by karsten＠torproject.org 14 Nov '17

14 Nov '17

commit b1e3d6368c70c6970ee8477004f34df9ca500329 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 14 21:20:35 2017 +0100 Tweak change log for internal release 2.0.0. --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b699ba9..7e21cf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ -# Changes in version 2.0.0 - 2017-11-?? +# Changes in version 2.0.0 - 2017-11-14 * Major changes - Use an embedded Jetty. + # Changes in version 1.0.3 - 2017-10-16 * Major changes

1 0