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

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 01 Feb '17

01 Feb '17

commit cc8a48e3b43ac9cbddd1680270bf60f20b36e798 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 1 21:48:10 2017 +0000 Update translations for tails-greeter-2 --- nl/nl.po | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 45be8b6..3913cc2 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -28,9 +28,9 @@ msgid "" "tasks. Otherwise, the administration password is disabled for better " "security." msgstr "" -"Voer een beheerderswachtwoord in wanneer je beheerstaken moet kunnen " -"uitvoeren. Indien dit niet ingevuld wordt, zal het uitgeschakeld worden voor" -" een betere beveiliging." +"Voer een beheerderswachtwoord in wanneer je beheerstaken moet uitvoeren. " +"Indien dit niet ingevuld wordt, zal het uitgeschakeld worden voor een betere" +" beveiliging." #: ../data/greeter.ui.h:3 msgid "Enter an administration password" @@ -159,7 +159,7 @@ msgstr "Versleutelde persistente opslag configureren" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" -msgstr "" +msgstr "Voer je wachtzin in om de persistente opslag te ontgrendelen." #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 #: ../tailsgreeter/gui.py:510 @@ -168,11 +168,13 @@ msgstr "Ontgrendel" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" -msgstr "" +msgstr "Persistente opslag weer vergrendelen" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" +"Je persistente opslag is ontgrendeld. Herstart Tails om het opnieuw te " +"vergrendelen." #: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings" @@ -196,6 +198,9 @@ msgid "" "configure a Tor bridge or a local proxy. To work completely offline, you can" " disable all networking." msgstr "" +"Als je internetverbinding is gecensureerd, gefilterd of via een proxy loopt," +" kan je een Tor bridge of lokale proxy configureren. Om helemaal offline te " +"werken, kan je alle netwerken uitschakelen." #: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" @@ -235,7 +240,7 @@ msgstr "Rechtstreeks (standaard)" #: ../tailsgreeter/gui.py:373 msgid "Bridge & Proxy" -msgstr "" +msgstr "Bridge & Proxy" #: ../tailsgreeter/gui.py:379 msgid "Offline" @@ -243,7 +248,7 @@ msgstr "Offline" #: ../tailsgreeter/gui.py:463 msgid "Failed to relock persistent storage." -msgstr "" +msgstr "Mislukt om de persistente opslag weer te vergrendelen." #: ../tailsgreeter/gui.py:481 msgid "Unlocking…" @@ -279,6 +284,8 @@ msgid "" "live-persist failed with return code {returncode}:\n" "{stderr}" msgstr "" +"live-persist mislukte met retourcode {returncode}:\n" +"{stderr}" #: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137 #, python-brace-format @@ -287,6 +294,9 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"cryptsetup mislukte met retourcode {returncode}:\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/persistence.py:154 #, python-brace-format @@ -295,6 +305,9 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"live-persist mislukte met retourcode {returncode}:\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/persistence.py:168 #, python-brace-format @@ -303,3 +316,6 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"unmount mislukte met retourcode {returncode}:\n" +"{stdout}\n" +"{stderr}"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 01 Feb '17

01 Feb '17

commit a82f94072a4ff293da72484b5a8cd17e146d8c82 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 1 21:18:05 2017 +0000 Update translations for tails-greeter-2 --- nl/nl.po | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 62f5294..45be8b6 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-01-31 10:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Wim <wikkesjr(a)gmail.com>, 2017\n" +"Last-Translator: kwadronaut <kwadronaut(a)autistici.org>, 2017\n" "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,18 +79,22 @@ msgid "" " as it helps you hide your geographical location. But it might also create " "connectivity problems or look suspicious." msgstr "" +"MAC adres spoofing verbergt het serienummer van je netwerkkaart (wifi of " +"kabel) op lokale netwerken. Spoofing MAC adressen is meestal veiliger want " +"het helpt in het verbergen van je geografische locatie. Maar het kan ook " +"verbindingsproblemen met zich meebrengen of er verdacht uitzien." #: ../data/greeter.ui.h:15 msgid "Spoof all MAC addresses (default)" -msgstr "" +msgstr "Alle MAC adressen spoofen (standaard)" #: ../data/greeter.ui.h:16 msgid "Don't spoof MAC addresses" -msgstr "" +msgstr "MAC adressen niet spoofen" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514 msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" +msgstr "Kan versleutelde opslag niet ontgrendelen met deze wachtzin." #: ../data/greeter.ui.h:18 msgid "" @@ -143,15 +147,15 @@ msgstr "Tijdzone" #: ../data/greeter.ui.h:29 msgid "Encrypted Persistent Storage" -msgstr "" +msgstr "Versleutelde persistente opslag" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" -msgstr "" +msgstr "Toon wachtzin" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" -msgstr "" +msgstr "Versleutelde persistente opslag configureren" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" @@ -160,7 +164,7 @@ msgstr "" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 #: ../tailsgreeter/gui.py:510 msgid "Unlock" -msgstr "maak los" +msgstr "Ontgrendel" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" @@ -243,7 +247,7 @@ msgstr "" #: ../tailsgreeter/gui.py:481 msgid "Unlocking…" -msgstr "maak los" +msgstr "Ontgrendelen…" #: ../tailsgreeter/gui.py:562 msgid "Cancel" @@ -267,7 +271,7 @@ msgstr "Start Tails" #: ../tailsgreeter/language.py:119 msgid "default:LTR" -msgstr "" +msgstr "Standaard: links naar rechts" #: ../tailsgreeter/persistence.py:89 #, python-brace-format

1 0

[tor/master] prop271: When we exhaust all guards, mark all of them for retry.
by nickm＠torproject.org 01 Feb '17

01 Feb '17

commit 2938fd3b859a71b9f484623b8dae61e8e7a7f7ec Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jan 17 12:59:41 2017 +0200 prop271: When we exhaust all guards, mark all of them for retry. In the past, when we exhausted all guards in our sampled set, we just waited there till we mark a guard for retry again (usually takes 10 mins for a primary guard, 1 hour for a non-primary guard). This patch marks all guards as maybe-reachable when we exhaust all guards (this can happen when network is down for some time). --- changes/bug21052 | 4 ++++ src/or/entrynodes.c | 39 +++++++++++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/changes/bug21052 b/changes/bug21052 new file mode 100644 index 0000000..0597b3b --- /dev/null +++ b/changes/bug21052 @@ -0,0 +1,4 @@ + o Minor bugfixes (client, guards): + - Fix a bug of the new guard algorithm where tor could stall for up to 10 + minutes before retrying a guard after a long period of no network. + Fixes bug 21052; bugfix on 0.3.0.1-alpha. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index ca3e57b..2b70230 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1900,7 +1900,9 @@ select_entry_guard_for_circuit(guard_selection_t *gs, SAMPLE_EXCLUDE_PRIMARY | SAMPLE_EXCLUDE_PENDING); if (guard == NULL) { - log_info(LD_GUARD, "Absolutely no sampled guards were available."); + log_info(LD_GUARD, "Absolutely no sampled guards were available. " + "Marking all guards for retry and starting from top again."); + mark_all_guards_maybe_reachable(gs); return NULL; } guard->is_pending = 1; @@ -1937,6 +1939,21 @@ entry_guards_note_guard_failure(guard_selection_t *gs, entry_guard_describe(guard)); } +/* Mark guard as maybe reachable again. */ +static void +mark_guard_maybe_reachable(entry_guard_t *guard) +{ + if (guard->is_reachable != GUARD_REACHABLE_NO) { + return; + } + + /* Note that we do not clear failing_since: this guard is now only + * _maybe-reachable_. */ + guard->is_reachable = GUARD_REACHABLE_MAYBE; + if (guard->is_filtered_guard) + guard->is_usable_filtered_guard = 1; +} + /** * Called when the network comes up after having seemed to be down for * a while: Mark the primary guards as maybe-reachable so that we'll @@ -1945,19 +1962,25 @@ entry_guards_note_guard_failure(guard_selection_t *gs, STATIC void mark_primary_guards_maybe_reachable(guard_selection_t *gs) { + tor_assert(gs); + if (!gs->primary_guards_up_to_date) entry_guards_update_primary(gs); SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { - if (guard->is_reachable != GUARD_REACHABLE_NO) - continue; + mark_guard_maybe_reachable(guard); + } SMARTLIST_FOREACH_END(guard); +} - /* Note that we do not clear failing_since: this guard is now only - * _maybe-reachable_. */ - guard->is_reachable = GUARD_REACHABLE_MAYBE; - if (guard->is_filtered_guard) - guard->is_usable_filtered_guard = 1; +/* Called when we exhaust all guards in our sampled set: Marks all guards as + * maybe-reachable so that we 'll try them again. */ +static void +mark_all_guards_maybe_reachable(guard_selection_t *gs) +{ + tor_assert(gs); + SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { + mark_guard_maybe_reachable(guard); } SMARTLIST_FOREACH_END(guard); }

1 0

[tor/master] prop271: Move new funcs to top, to avoid compiler warnings.
by nickm＠torproject.org 01 Feb '17

01 Feb '17

commit def7115fe4cab45b4e3edc8fa3d8e063f04675d3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jan 17 13:04:45 2017 +0200 prop271: Move new funcs to top, to avoid compiler warnings. --- src/or/entrynodes.c | 91 +++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 2b70230..e26f32d 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -570,6 +570,52 @@ get_extreme_restriction_threshold(void) 1, INT32_MAX); return pct / 100.0; } + +/* Mark guard as maybe reachable again. */ +static void +mark_guard_maybe_reachable(entry_guard_t *guard) +{ + if (guard->is_reachable != GUARD_REACHABLE_NO) { + return; + } + + /* Note that we do not clear failing_since: this guard is now only + * _maybe-reachable_. */ + guard->is_reachable = GUARD_REACHABLE_MAYBE; + if (guard->is_filtered_guard) + guard->is_usable_filtered_guard = 1; +} + +/** + * Called when the network comes up after having seemed to be down for + * a while: Mark the primary guards as maybe-reachable so that we'll + * try them again. + */ +STATIC void +mark_primary_guards_maybe_reachable(guard_selection_t *gs) +{ + tor_assert(gs); + + if (!gs->primary_guards_up_to_date) + entry_guards_update_primary(gs); + + SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { + mark_guard_maybe_reachable(guard); + } SMARTLIST_FOREACH_END(guard); +} + +/* Called when we exhaust all guards in our sampled set: Marks all guards as + maybe-reachable so that we 'll try them again. */ +static void +mark_all_guards_maybe_reachable(guard_selection_t *gs) +{ + tor_assert(gs); + + SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { + mark_guard_maybe_reachable(guard); + } SMARTLIST_FOREACH_END(guard); +} + /**@}*/ /** @@ -1939,51 +1985,6 @@ entry_guards_note_guard_failure(guard_selection_t *gs, entry_guard_describe(guard)); } -/* Mark guard as maybe reachable again. */ -static void -mark_guard_maybe_reachable(entry_guard_t *guard) -{ - if (guard->is_reachable != GUARD_REACHABLE_NO) { - return; - } - - /* Note that we do not clear failing_since: this guard is now only - * _maybe-reachable_. */ - guard->is_reachable = GUARD_REACHABLE_MAYBE; - if (guard->is_filtered_guard) - guard->is_usable_filtered_guard = 1; -} - -/** - * Called when the network comes up after having seemed to be down for - * a while: Mark the primary guards as maybe-reachable so that we'll - * try them again. - */ -STATIC void -mark_primary_guards_maybe_reachable(guard_selection_t *gs) -{ - tor_assert(gs); - - if (!gs->primary_guards_up_to_date) - entry_guards_update_primary(gs); - - SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { - mark_guard_maybe_reachable(guard); - } SMARTLIST_FOREACH_END(guard); -} - -/* Called when we exhaust all guards in our sampled set: Marks all guards as - * maybe-reachable so that we 'll try them again. */ -static void -mark_all_guards_maybe_reachable(guard_selection_t *gs) -{ - tor_assert(gs); - - SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { - mark_guard_maybe_reachable(guard); - } SMARTLIST_FOREACH_END(guard); -} - /** * Note that we successfully connected to, and built a circuit through * guard. Given the old guard-state of the circuit in old_state,

1 0

[tor/master] Merge remote-tracking branch 'asn/bug21052'
by nickm＠torproject.org 01 Feb '17

01 Feb '17

commit 2d2ab29ce89d85f64f4bf4802d6b1e22a74a9ad9 Merge: 77788fa def7115 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 1 15:53:16 2017 -0500 Merge remote-tracking branch 'asn/bug21052' changes/bug21052 | 4 +++ src/or/entrynodes.c | 74 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 25 deletions(-) diff --cc src/or/entrynodes.c index e341739,e26f32d..b7c05f1 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@@ -1851,10 -1944,11 +1897,12 @@@ select_entry_guard_for_circuit(guard_se rst, SAMPLE_EXCLUDE_CONFIRMED | SAMPLE_EXCLUDE_PRIMARY | - SAMPLE_EXCLUDE_PENDING); + SAMPLE_EXCLUDE_PENDING | + flags); if (guard == NULL) { - log_info(LD_GUARD, "Absolutely no sampled guards were available."); + log_info(LD_GUARD, "Absolutely no sampled guards were available. " + "Marking all guards for retry and starting from top again."); + mark_all_guards_maybe_reachable(gs); return NULL; } guard->is_pending = 1;

1 0

[torbutton/maint-1.9.6] Bug 21330: Non-usable scrollbar appears in tor browser security settings
by gk＠torproject.org 01 Feb '17

01 Feb '17

commit 2a311617e1045cf5316fdab9aea1df9b1c7d02d4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 1 10:45:36 2017 -0500 Bug 21330: Non-usable scrollbar appears in tor browser security settings Wait until after the security settings window has finished loading before enabling the description box's scrollbar. --- src/chrome/content/preferences.js | 5 +++++ src/chrome/content/preferences.xul | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1f94dbb..1e47cad 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -41,6 +41,11 @@ function torbutton_init_security_ui() { torbutton_set_slider(prefSettingToSliderPosition( getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); + + // Show a scrollbar for the description text if one is needed. + // To avoid bug 21330, we set the overflow=auto style here instead + // of directly in the XUL. + document.getElementById("descBox").style.overflow = "auto"; }; // Write the two prefs from the current settings. diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index bb6e31f..554312c 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -57,7 +57,7 @@ </vbox> </hbox> </vbox> - <vbox flex="1" width="400" style="overflow: auto;"> + <vbox id="descBox" flex="1" width="400" style="overflow: hidden;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0

[torbutton/master] Bug 21330: Non-usable scrollbar appears in tor browser security settings
by gk＠torproject.org 01 Feb '17

01 Feb '17

commit 9c4a20bec5d1f3fc38a103b4f47c1039f48119dd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 1 10:45:36 2017 -0500 Bug 21330: Non-usable scrollbar appears in tor browser security settings Wait until after the security settings window has finished loading before enabling the description box's scrollbar. --- src/chrome/content/preferences.js | 5 +++++ src/chrome/content/preferences.xul | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1f94dbb..1e47cad 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -41,6 +41,11 @@ function torbutton_init_security_ui() { torbutton_set_slider(prefSettingToSliderPosition( getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); + + // Show a scrollbar for the description text if one is needed. + // To avoid bug 21330, we set the overflow=auto style here instead + // of directly in the XUL. + document.getElementById("descBox").style.overflow = "auto"; }; // Write the two prefs from the current settings. diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index bb6e31f..554312c 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -57,7 +57,7 @@ </vbox> </hbox> </vbox> - <vbox flex="1" width="400" style="overflow: auto;"> + <vbox id="descBox" flex="1" width="400" style="overflow: hidden;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0

[tor-messenger-build/master] Bump tag on comm-esr45 to THUNDERBIRD_45_7_0_RELEASE
by arlo＠torproject.org 01 Feb '17

01 Feb '17

commit be112c3ebcb263f55fb6236ed8fe2b95abb22277 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Feb 1 09:10:36 2017 -0800 Bump tag on comm-esr45 to THUNDERBIRD_45_7_0_RELEASE * Should have been part of 1eb04e3a9 --- projects/instantbird/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 13859d7..1f3ecae 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr45/ -hg_hash: THUNDERBIRD_45_6_0_RELEASE +hg_hash: THUNDERBIRD_45_7_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]" remote_docker: 1 var:

1 0

[stem/master] Fix unit tests
by atagar＠torproject.org 01 Feb '17

01 Feb '17

commit c138aa193350012ea97a6e7397fdd74661946981 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 1 09:09:04 2017 -0800 Fix unit tests Huh. Not sure why these didn't come up on my netbook. Moving resources broke three of our tests. --- test/unit/descriptor/extrainfo_descriptor.py | 2 +- test/unit/descriptor/networkstatus/document_v3.py | 2 +- test/unit/descriptor/router_status_entry.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index ce898d3..8dc4130 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -171,7 +171,7 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw Malformed descriptor with non-ascii content for the 'dirreq-v3-reqs' line. """ - with open(get_resource('extrainfo_nonascii_v3_reqs'), 'rb') as descriptor_file: + with open(get_resource('unparseable/extrainfo_nonascii_v3_reqs'), 'rb') as descriptor_file: try: next(stem.descriptor.parse_file(descriptor_file, 'extra-info 1.0', validate = True)) self.fail("validation should've raised an exception") diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index f34bcc8..a3da8a4 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -240,7 +240,7 @@ JZ/1HL9sHyZfo6bwaC6YSM9PNiiY6L7rnGpS7UkHiFI+M96VCMorvjm5YPs3FioJ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= -----END SIGNATURE-----""" - with open(get_resource('vote'), 'rb') as descriptor_file: + with open(get_resource('unparseable/vote'), 'rb') as descriptor_file: document = stem.descriptor.networkstatus.NetworkStatusDocumentV3(descriptor_file.read(), default_params = False) self.assertEqual(3, document.version) diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index fc02539..43bcaee 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -629,7 +629,7 @@ class TestRouterStatusEntry(unittest.TestCase): Read a descriptor file with windows newlines (CRLF). """ - descriptor_path = get_resource('cached-microdesc-consensus_with_carriage_returns') + descriptor_path = get_resource('unparseable/cached-microdesc-consensus_with_carriage_returns') with open(descriptor_path, 'rb') as descriptor_file: descriptors = stem.descriptor.parse_file(descriptor_file, 'network-status-microdesc-consensus-3 1.0', normalize_newlines = True)

1 0

[metrics-lib/master] Make the reader thread a daemon thread.
by karsten＠torproject.org 01 Feb '17

01 Feb '17

commit 74ee2145eedacb61b14e9c234b8f4266710e5eb9 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Oct 25 12:33:24 2016 +0200 Make the reader thread a daemon thread. --- CHANGELOG.md | 4 ++++ .../java/org/torproject/descriptor/impl/DescriptorReaderImpl.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afaa1e8..755428d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ process. - Avoid deleting extraneous local descriptor files when collecting descriptors from CollecTor. + - Turn the descriptor reader thread into a daemon thread, so that + the application can decide at any time to stop consuming + descriptors without having to worry about the reader thread not + being done. # Changes in version 1.5.0 - 2016-10-19 diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index cb14588..12d73ad 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -153,7 +153,9 @@ public class DescriptorReaderImpl implements DescriptorReader { this.tarballs, descriptorQueue, this.autoSaveHistoryFile, this.manualSaveHistoryFile, this.excludedFiles, this.failUnrecognizedDescriptorLines); - new Thread(this.reader).start(); + Thread readerThread = new Thread(this.reader); + readerThread.setDaemon(true); + readerThread.start(); return descriptorQueue; }

1 0