January 2020 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.2'
by teor＠torproject.org 15 Jan '20

15 Jan '20

commit 4025cbada6ab01247275faec8dd32ae857ef0fd5 Merge: f3cbc26bd 48187248d Author: teor <teor(a)torproject.org> Date: Thu Jan 16 10:00:55 2020 +1000 Merge branch 'maint-0.4.2'

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5
by teor＠torproject.org 15 Jan '20

15 Jan '20

commit 19954cffd7710ccac778aa5cf15ae1bc6a5d56fa Merge: 0b3763612 4d70e725d Author: teor <teor(a)torproject.org> Date: Thu Jan 16 09:57:27 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 changes/ticket32407 | 4 ++++ src/core/mainloop/mainloop.c | 4 ++++ src/lib/evloop/compat_libevent.c | 10 ++++++++++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 15 Jan '20

15 Jan '20

commit 48187248d3f79243590d60285708f3e2d45f8d8f Merge: 7e111d0ea fb541ffca Author: teor <teor(a)torproject.org> Date: Thu Jan 16 10:00:47 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 15 Jan '20

15 Jan '20

commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2 Merge: d96b35d66 19954cffd Author: teor <teor(a)torproject.org> Date: Thu Jan 16 10:00:32 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket32407 | 4 ++++ src/core/mainloop/mainloop.c | 4 ++++ src/lib/evloop/compat_libevent.c | 10 ++++++++++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 insertions(+)

1 0

[tor/master] add_c_file: Fix "control line not preceded by a blank line"
by teor＠torproject.org 15 Jan '20

15 Jan '20

commit f3cbc26bdd0d26c5bd80d2c3bc40f90d70a814f5 Author: teor <teor(a)torproject.org> Date: Thu Jan 16 09:38:26 2020 +1000 add_c_file: Fix "control line not preceded by a blank line" Fix dirauth and relay module include.am add_c_file.py "control line not preceded by a blank line" errors. Also remove a duplicate ADD_C_FILE: SOURCES in the relay module. Obviously correct fixes to already-reviewed code. --- src/feature/dirauth/include.am | 1 + src/feature/relay/include.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/feature/dirauth/include.am b/src/feature/dirauth/include.am index ec7b3b296..2ef629ae3 100644 --- a/src/feature/dirauth/include.am +++ b/src/feature/dirauth/include.am @@ -1,5 +1,6 @@ # The Directory Authority module. + # ADD_C_FILE: INSERT SOURCES HERE. MODULE_DIRAUTH_SOURCES = \ src/feature/dirauth/authmode.c \ diff --git a/src/feature/relay/include.am b/src/feature/relay/include.am index aa9aa3adf..a4c025ae1 100644 --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@ -1,5 +1,5 @@ -# ADD_C_FILE: INSERT SOURCES HERE. +# Legacy shared relay code: migrate to the relay module over time LIBTOR_APP_A_SOURCES += \ src/feature/relay/dns.c \ src/feature/relay/ext_orport.c \ @@ -9,6 +9,7 @@ LIBTOR_APP_A_SOURCES += \ src/feature/relay/selftest.c # The Relay module. + # ADD_C_FILE: INSERT SOURCES HERE. MODULE_RELAY_SOURCES = \ src/feature/relay/routermode.c \

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 15 Jan '20

15 Jan '20

commit 9c59b1a895385680239c1039f810aece91b5bf13 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 22:48:34 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- en_GB.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/en_GB.po b/en_GB.po index ca8eec86f9..e9123101cd 100644 --- a/en_GB.po +++ b/en_GB.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Andi Chandler <andi(a)gowling.com>, 2014-2017,2019 +# Andi Chandler <andi(a)gowling.com>, 2014-2017,2019-2020 # Billy Humphreys <sysop(a)enderbbs.enderservices.tk>, 2014 # newharha ehrara <dbybgohg(a)yomail.info>, 2015 # Richard Shaylor <rshaylor(a)me.com>, 2014 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-01-06 13:47+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-01-15 22:46+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 15 Jan '20

15 Jan '20

commit 7b7e7387806f22746d7822953698bf288a70650a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 22:47:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- en_GB.po | 104 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/en_GB.po b/en_GB.po index 67819996dd..746a97a82c 100644 --- a/en_GB.po +++ b/en_GB.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Andi Chandler <andi(a)gowling.com>, 2014-2017,2019 +# Andi Chandler <andi(a)gowling.com>, 2014-2017,2019-2020 # Billy Humphreys <sysop(a)enderbbs.enderservices.tk>, 2014 # newharha ehrara <dbybgohg(a)yomail.info>, 2015 # Richard Shaylor <rshaylor(a)me.com>, 2014 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-01-06 13:47+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2020-01-15 22:46+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,7 +105,7 @@ msgstr "_Exit" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "" +msgstr "For debugging information, execute the following command: sudo tails-debugging-info" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:244 msgid "" @@ -114,15 +114,15 @@ msgid "" "website.\\n\\nCheck your network connection, and restart Tails to try " "upgrading again.\\n\\nIf the problem persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "" +msgstr "An error occured while updating the signing key.\\n\\nThis prevents determining whether an upgrade is available from our website.\\n\\nCheck your network connection, and restart Tails to try upgrading again.\\n\\nIf the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:250 msgid "Error while updating the signing key" -msgstr "" +msgstr "Error while updating the signing key" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:279 msgid "Error while checking for upgrades" -msgstr "" +msgstr "Error while checking for upgrades" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:282 msgid "" @@ -131,64 +131,64 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "" +msgstr "Could not determine whether an upgrade is available from our website.\n\nCheck your network connection, and restart Tails to try upgrading again.\n\nIf the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:297 msgid "no automatic upgrade is available from our website for this version" -msgstr "" +msgstr "no automatic upgrade is available from our website for this version" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:303 msgid "your device was not created using a USB image or Tails Installer" -msgstr "" +msgstr "your device was not created using a USB image or Tails Installer" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:308 msgid "Tails was started from a DVD or a read-only device" -msgstr "" +msgstr "Tails was started from a DVD or a read-only device" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:313 msgid "there is not enough free space on the Tails system partition" -msgstr "" +msgstr "there is not enough free space on the Tails system partition" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:318 msgid "not enough memory is available on this system" -msgstr "" +msgstr "not enough memory is available on this system" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:324 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." -msgstr "" +msgstr "No explanation available for reason '%{reason}s'." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:345 msgid "The system is up-to-date" -msgstr "" +msgstr "The system is up-to-date" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:350 msgid "This version of Tails is outdated, and may have security issues." -msgstr "" +msgstr "This version of Tails is outdated, and may have security issues." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:382 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "" +msgstr "The available incremental upgrade requires %{space_needed}s of free space on Tails system partition, but only %{free_space}s is available." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:398 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "" +msgstr "The available incremental upgrade requires %{memory_needed}s of free memory, but only %{free_memory}s is available." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:420 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "An incremental upgrade is available, but no full upgrade is.\nThis should not happen. Please report a bug." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:424 msgid "Error while detecting available upgrades" -msgstr "" +msgstr "Error while detecting available upgrades" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:434 #, perl-brace-format @@ -203,19 +203,19 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "You should upgrade to %{name}s %{version}s.\n\nFor more information about this new version, go to %{details_url}s\n\nWe recommend you close all other applications during the upgrade.\nDownloading the upgrade might take a long time, from several minutes to a few hours.\n\nDownload size: %{size}s\n\nDo you want to upgrade now?" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:448 msgid "Upgrade available" -msgstr "" +msgstr "Upgrade available" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:449 msgid "Upgrade now" -msgstr "" +msgstr "Upgrade now" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:450 msgid "Upgrade later" -msgstr "" +msgstr "Upgrade later" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:458 #, perl-brace-format @@ -227,20 +227,20 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/upgrade/#manual" -msgstr "" +msgstr "You should do a manual upgrade to %{name}s %{version}s.\n\nFor more information about this new version, go to %{details_url}s\n\nIt is not possible to automatically upgrade your device to this new version: %{explanation}s.\n\nTo learn how to do a manual upgrade, go to https://tails.boum.org/doc/upgrade/#manual" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:474 msgid "New version available" -msgstr "" +msgstr "New version available" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:555 msgid "Downloading upgrade" -msgstr "" +msgstr "Downloading upgrade" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:558 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." -msgstr "" +msgstr "Downloading the upgrade to %{name}s %{version}s..." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:599 msgid "" @@ -248,38 +248,38 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "" +msgstr "The upgrade could not be downloaded.\\n\\nCheck your network connection, and restart Tails to try upgrading again.\\n\\nIf the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:615 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:634 msgid "Error while downloading the upgrade" -msgstr "" +msgstr "Error while downloading the upgrade" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:627 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "" +msgstr "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file did not complain. Please report a bug." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:646 msgid "Error while creating temporary downloading directory" -msgstr "" +msgstr "Error while creating temporary downloading directory" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:649 msgid "Failed to create temporary download directory" -msgstr "" +msgstr "Failed to create temporary download directory" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:673 msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Could not choose a download server.\n\nThis should not happen. Please report a bug." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:677 msgid "Error while choosing a download server" -msgstr "" +msgstr "Error while choosing a download server" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:692 msgid "" @@ -288,15 +288,15 @@ msgid "" "The network connection will now be disabled.\n" "\n" "Please save your work and close all other applications." -msgstr "" +msgstr "The upgrade was successfully downloaded.\n\nThe network connection will now be disabled.\n\nPlease save your work and close all other applications." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:698 msgid "Upgrade successfully downloaded" -msgstr "" +msgstr "Upgrade successfully downloaded" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700 msgid "Apply upgrade" -msgstr "" +msgstr "Apply upgrade" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:707 msgid "" @@ -306,46 +306,46 @@ msgid "" "You should restart Tails on the new version as soon as possible.\n" "\n" "Do you want to restart now?" -msgstr "" +msgstr "Your Tails device was successfully upgraded.\n\nSome security features were temporarily disabled.\nYou should restart Tails on the new version as soon as possible.\n\nDo you want to restart now?" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:712 msgid "Restart Tails" -msgstr "" +msgstr "Restart Tails" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:713 msgid "Restart now" -msgstr "" +msgstr "Restart now" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:714 msgid "Restart later" -msgstr "" +msgstr "Restart later" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:725 msgid "Error while restarting the system" -msgstr "" +msgstr "Error while restarting the system" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:728 msgid "Failed to restart the system" -msgstr "" +msgstr "Failed to restart the system" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:743 msgid "Error while shutting down the network" -msgstr "" +msgstr "Error while shutting down the network" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:746 msgid "Failed to shutdown network" -msgstr "" +msgstr "Failed to shutdown network" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:753 msgid "Upgrading the system" -msgstr "" +msgstr "Upgrading the system" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:755 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." -msgstr "" +msgstr "Your Tails device is being upgraded...\n\nFor security reasons, the networking is now disabled." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:788 msgid "" @@ -353,11 +353,11 @@ msgid "" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" " instructions at " "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -msgstr "" +msgstr "An error occured while installing the upgrade.\\n\\nYour Tails device needs to be repaired and might be unable to restart.\\n\\nPlease follow the instructions at file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:798 msgid "Error while installing the upgrade" -msgstr "" +msgstr "Error while installing the upgrade" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32 msgid "Additional Settings" @@ -518,13 +518,13 @@ msgstr "Error" msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "" +msgstr "The device Tails is running from cannot be found. Maybe you used the 'toram' option?" #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:253 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "" +msgstr "The drive Tails is running from cannot be found. Maybe you used the 'toram' option?" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Lock screen"

1 0

[exonerator/release] Bump version to 4.2.0-dev.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit ec51d14df47ee9dae29a9e2cbfbc9a3ba55459f9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 22:45:32 2019 +0100 Bump version to 4.2.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 632f622..9c0cf51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 4.?.? - 2019-1?-?? + + # Changes in version 4.2.0 - 2019-11-09 * Medium changes diff --git a/build.xml b/build.xml index 38fee16..312f249 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="ExoneraTor API Documentation"/> <property name="implementation-title" value="ExoneraTor" /> - <property name="release.version" value="4.2.0" /> + <property name="release.version" value="4.2.0-dev" /> <property name="metricslibversion" value="2.9.1" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[exonerator/release] Avoid unnecessary continue and empty block.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit e50f0204455c68b9b785232640cf289f4be827e1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 15:51:57 2019 +0100 Avoid unnecessary continue and empty block. --- .../torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java | 6 +----- 1 file changed, 1 insertion(+), 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 57eb5df..fcc534f 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java @@ -76,14 +76,10 @@ public class ExoneraTorDatabaseImporter { try { BufferedReader br = new BufferedReader(new FileReader(configFile)); while ((line = br.readLine()) != null) { - if (line.startsWith("#") || line.length() < 1) { - continue; - } else if (line.startsWith("ExoneraTorDatabaseJdbc")) { + if (line.startsWith("ExoneraTorDatabaseJdbc")) { jdbcString = line.split(" ")[1]; } else if (line.startsWith("ExoneraTorImportDirectory")) { importDirString = line.split(" ")[1]; - } else { - /* Ignore unrecognized configuration keys. */ } } br.close();

1 0

[exonerator/release] Remove unnecessary method call.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit a4187326e58ea40ef3f43d0a0e5a86fe3b6d9c89 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 16:39:05 2019 +0100 Remove unnecessary method call. --- .../org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java index fcc534f..47261fc 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java @@ -380,7 +380,7 @@ public class ExoneraTorDatabaseImporter { parseHistoryFile)); for (Map.Entry<String, Long> historyEntry : nextImportHistory.entrySet()) { - bw.write(String.valueOf(historyEntry.getValue()) + "," + bw.write(historyEntry.getValue() + "," + historyEntry.getKey() + "\n"); } bw.close();

1 0