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

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

02 Oct '18

commit 354829492f5b99a15416fc32fc8c85d0d8da8a60 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 2 07:17:18 2018 +0000 Update translations for tor-browser-manual --- ka/ka.po | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ka/ka.po b/ka/ka.po index 90bd63859..c60d5824f 100644 --- a/ka/ka.po +++ b/ka/ka.po @@ -1829,10 +1829,13 @@ msgid "" " computer. Uninstalling Tor Browser will not affect your system’s software " "or settings." msgstr "" +"Tor-ბრაუზერი არ ზემოქმედებს დანარჩენ პროგრამებზე ან თქვენი კომპიუტერის " +"პარამეტრებზე. ასე რომ, მისი ამოშლა არ მოახდენს გავლენას სხვა პროგრამებსა და " +"პარამეტრებზე თქვენს სისტემაში." #: uninstalling.page:18 msgid "Removing Tor Browser from your system is simple:" -msgstr "" +msgstr "Tor-ბრაუზერის სისტემიდან ამოშლა მარტივია:" #: uninstalling.page:24 msgid "" @@ -1841,27 +1844,33 @@ msgid "" "default location, however the folder will be named \"tor-browser_en-US\" if " "you are running the English Tor Browser." msgstr "" +"მონახეთ თქვენი Tor-ბრაუზერის საქაღალდე. ნაგულისხმევი მდებარეობა Windows-ზე " +"არის მთავარი სამუშაო ეკრანი (Desktop); Mac OS X-ზე იქნება პროგრამების " +"საქაღალდე. Linux-ზე არ არსებობს ასეთი მდებარეობა, თუმცა წესით უნდა იყოს " +"საქაღალდეში დასახელებით „tor-browser_en-US“, ინგლისური ვერსიის შემთხვევაში." #: uninstalling.page:32 msgid "Delete the Tor Browser folder." -msgstr "" +msgstr "წაშალეთ Tor-ბრაუზერის საქაღალდე." #: uninstalling.page:35 msgid "Empty your Trash" -msgstr "" +msgstr "გაასუფთავეთ სანაგვე ურნა" #: uninstalling.page:39 msgid "" "Note that your operating system’s standard “Uninstall” utility is not used." msgstr "" +"შენიშნავდით, რომ თქვენი სისტემის „პროგრამების ამოშლის“ ჩვეულებრივი საშუალება" +" არ გამოიყენება." #: updating.page:6 msgid "How to update Tor Browser" -msgstr "" +msgstr "როგორ განვაახლოთ Tor-ბრაუზერი" #: updating.page:10 msgid "Updating" -msgstr "" +msgstr "განახლება" #: updating.page:12 msgid ""

1 0

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

02 Oct '18

commit 16b3b4dd9254babee97544b1d7dfb8c1f5451c1c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 2 06:47:20 2018 +0000 Update translations for tor-browser-manual --- ka/ka.po | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/ka/ka.po b/ka/ka.po index fb157fd60..90bd63859 100644 --- a/ka/ka.po +++ b/ka/ka.po @@ -1750,12 +1750,16 @@ msgid "" "Your computer’s system clock must be set correctly, or Tor will not be able " "to connect." msgstr "" +"თქვენს კომპიუტერზე სისტემის დრო უნდა იყოს გასწორებული, თუ არადა Tor ვერ " +"მოახერხებს დაკავშირებას." #: troubleshooting.page:35 msgid "" "Make sure another Tor Browser is not already running. If you’re not sure if " "Tor Browser is running, restart your computer." msgstr "" +"დარწმუნდით, რომ უკვე არაა Tor-ბრაუზერი გაშვებული. თუ ვერ ახერხებთ ამის " +"გადამოწმებას, გამორთეთ და ხელახლა ჩართეთ კომპიუტერი." #: troubleshooting.page:41 msgid "" @@ -1763,20 +1767,26 @@ msgid "" "Tor from running. You may need to consult the documentation for your " "antivirus software if you do not know how to do this." msgstr "" +"დარწმუნდით, რომ ანტივირუსული პროგრამა რომელიც გიყენიათ, არ უშლის ხელს Tor-ის" +" გაშვებას. თუ არ იცით როგორ ხდება გადამოწმება, დაგჭირდებათ ანტივირუსული " +"პროგრამის სახელმძღვანელო მასალების გაცნობა." #: troubleshooting.page:49 msgid "Temporarily disable your firewall." -msgstr "" +msgstr "დროებით გათიშეთ ქსელის ფარი (Firewall)." #: troubleshooting.page:54 msgid "" "Delete Tor Browser and install it again. If updating, do not just overwrite " "your previous Tor Browser files; ensure they are fully deleted beforehand." msgstr "" +"წაშალეთ Tor-ბრაუზერი და დააყენეთ ხელახლა. თუ განახლება გსურთ, პირდაპირ არ " +"გადააწეროთ ძველი Tor-ბრაუზერის ფაილებს; ჯერ დარწმუნდით, რომ ყველაფერი " +"სრულადაა წაშლილი." #: troubleshooting.page:64 msgid "Is your connection censored?" -msgstr "" +msgstr "თქვენი კავშირი ცენზურის ქვეშაა?" #: troubleshooting.page:65 msgid "" @@ -1791,7 +1801,7 @@ msgstr "" #: troubleshooting.page:74 msgid "Known issues" -msgstr "" +msgstr "ცნობილი ხარვეზები" #: troubleshooting.page:75 msgid "" @@ -1800,14 +1810,18 @@ msgid "" "Issues</link> page to see if the problem you are experiencing is already " "listed there." msgstr "" +"Tor-ბრაუზერი მუდმივად მუშავდება და ცნობილია ზოგიერთი ხარვეზი, რომელიც ჯერ " +"არაა მოგვარებული. გთხოვთ, გაეცნოთ <link xref=\"known-issues\">ცნობილი " +"ხარვეზების</link> გვერდს და ნახოთ, თქვენ მიერ აღმოჩენილი ხარვეზი, უკვე " +"აღრიცხულია თუ არა მოცემულ ჩამონათვალში." #: uninstalling.page:6 msgid "How to remove Tor Browser from your system" -msgstr "" +msgstr "როგორ ხდება Tor-ბრაუზერის სისტემიდან ამოშლა" #: uninstalling.page:10 msgid "Uninstalling" -msgstr "" +msgstr "ამოშლა" #: uninstalling.page:12 msgid ""

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 02 Oct '18

02 Oct '18

commit 8c91e0824dfa58367968f9826eb6e5d46b2bcd79 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 2 05:18:46 2018 +0000 Update translations for support-portal --- contents+el.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contents+el.po b/contents+el.po index 40cb2812d..0aabbec63 100644 --- a/contents+el.po +++ b/contents+el.po @@ -8,13 +8,14 @@ # A Papac <ap909219(a)protonmail.com>, 2018 # Emma Peel, 2018 # Antonios Chariton <daknob.mac(a)gmail.com>, 2018 +# ilias_ <teneatis(a)gmail.com>, 2018 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-14 21:15+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Antonios Chariton <daknob.mac(a)gmail.com>, 2018\n" +"Last-Translator: ilias_ <teneatis(a)gmail.com>, 2018\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1613,7 +1614,7 @@ msgstr "can-eavesdroppers-see-information-i-share" #: http//localhost/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.title) msgid "Can I set Tor Browser as my default browser?" -msgstr "" +msgstr "Μπορώ να χρησιμοποιώ το Tor σαν προεπιλεγμένο περιηγητή;" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -2797,7 +2798,7 @@ msgstr "cannot-reach-x-onion" #: http//localhost/misc/misc-3/ #: (content/misc/misc-3/contents+en.lrquestion.title) msgid "Who funds Tor?" -msgstr "" +msgstr "Ποιος χρηματοδοτεί το Tor;" #: http//localhost/tbb/tbb-24/ #: (content/tbb/tbb-24/contents+en.lrquestion.seo_slug)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 01 Oct '18

01 Oct '18

commit 809410d9dbab8565cd4c2ce8e538e5d15b4985ff Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 1 20:15:36 2018 +0000 Update translations for https_everywhere_completed --- bn_BD/https-everywhere.dtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bn_BD/https-everywhere.dtd b/bn_BD/https-everywhere.dtd index feb0ebf7e..1f41bbe0d 100644 --- a/bn_BD/https-everywhere.dtd +++ b/bn_BD/https-everywhere.dtd @@ -18,6 +18,7 @@ <!ENTITY https-everywhere.options.enableMixedRulesets "মিশ্র কন্টেন্ট/বিষয়বস্তু নিয়মাবলী সক্ষম করুন"> <!ENTITY https-everywhere.options.showDevtoolsTab "Devtools ট্যাব দেখান"> <!ENTITY https-everywhere.options.autoUpdateRulesets "স্বয়ংক্রিয় আপডেট নিয়মাবলী"> +<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere সাইট অকার্যকর"> <!ENTITY https-everywhere.options.updateChannelsWarning "সতর্কীকরণ: যোগ করা চ্যানেলগুলো আপনার ব্রাউজার হাইজ্যাক করতে হামলাকারীদের কারণ হতে পারে । আপনি যদি জানেন আপনি কি করছেন তাহলে এই বিভাগ শুধুমাত্র সম্পাদনা করুন!"> <!ENTITY https-everywhere.options.addUpdateChannel "হালনাগাদ চ্যানেল জুড়ুন"> <!ENTITY https-everywhere.options.enterUpdateChannelName "হালনাগাদ চ্যানেল নাম প্রবেশ করান"> @@ -38,6 +39,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "এই ওয়েবসাইটগুলিতে এনক্রিপ্ট সংযোগ চালু করুন:"> <!ENTITY https-everywhere.chrome.experimental_rules "পরীক্ষামূলক নিয়ম"> <!ENTITY https-everywhere.chrome.experimental_rules_description "সতর্কতা বা ভাঙ্গন হতে পারে। বিপদ এড়ানোর জন্য বন্ধ করা হয়েছে।"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "এই সাইটের জন্য HTTPS Everywhere অকার্যকর করুন"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "এই সাইটের জন্য HTTPS Everywhere কার্যকর করুন"> <!ENTITY https-everywhere.chrome.add_rule "এই সাইটের জন্য একটি নিয়ম যোগ করুন"> <!ENTITY https-everywhere.chrome.add_new_rule "এই সাইটের জন্য নতুন একটি নিয়ম যোগ করুন"> <!ENTITY https-everywhere.chrome.always_https_for_host "সর্বদা এই হোস্টের জন্য HTTPS ব্যবহার করুন">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 01 Oct '18

01 Oct '18

commit b552a79bfc66a4817f454aaf6c8ee87e0efaac75 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 1 20:15:28 2018 +0000 Update translations for https_everywhere --- bn_BD/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bn_BD/https-everywhere.dtd b/bn_BD/https-everywhere.dtd index 0105b69d7..1f41bbe0d 100644 --- a/bn_BD/https-everywhere.dtd +++ b/bn_BD/https-everywhere.dtd @@ -18,7 +18,7 @@ <!ENTITY https-everywhere.options.enableMixedRulesets "মিশ্র কন্টেন্ট/বিষয়বস্তু নিয়মাবলী সক্ষম করুন"> <!ENTITY https-everywhere.options.showDevtoolsTab "Devtools ট্যাব দেখান"> <!ENTITY https-everywhere.options.autoUpdateRulesets "স্বয়ংক্রিয় আপডেট নিয়মাবলী"> -<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere Sites Disabled"> +<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere সাইট অকার্যকর"> <!ENTITY https-everywhere.options.updateChannelsWarning "সতর্কীকরণ: যোগ করা চ্যানেলগুলো আপনার ব্রাউজার হাইজ্যাক করতে হামলাকারীদের কারণ হতে পারে । আপনি যদি জানেন আপনি কি করছেন তাহলে এই বিভাগ শুধুমাত্র সম্পাদনা করুন!"> <!ENTITY https-everywhere.options.addUpdateChannel "হালনাগাদ চ্যানেল জুড়ুন"> <!ENTITY https-everywhere.options.enterUpdateChannelName "হালনাগাদ চ্যানেল নাম প্রবেশ করান"> @@ -39,8 +39,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "এই ওয়েবসাইটগুলিতে এনক্রিপ্ট সংযোগ চালু করুন:"> <!ENTITY https-everywhere.chrome.experimental_rules "পরীক্ষামূলক নিয়ম"> <!ENTITY https-everywhere.chrome.experimental_rules_description "সতর্কতা বা ভাঙ্গন হতে পারে। বিপদ এড়ানোর জন্য বন্ধ করা হয়েছে।"> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Disable HTTPS Everywhere on this site"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Enable HTTPS Everywhere on this site"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "এই সাইটের জন্য HTTPS Everywhere অকার্যকর করুন"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "এই সাইটের জন্য HTTPS Everywhere কার্যকর করুন"> <!ENTITY https-everywhere.chrome.add_rule "এই সাইটের জন্য একটি নিয়ম যোগ করুন"> <!ENTITY https-everywhere.chrome.add_new_rule "এই সাইটের জন্য নতুন একটি নিয়ম যোগ করুন"> <!ENTITY https-everywhere.chrome.always_https_for_host "সর্বদা এই হোস্টের জন্য HTTPS ব্যবহার করুন">

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 27865: Fix start-up crashes on Windows
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 06750f24d6c10d12158d2402361e3ce71d8493e1 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 30 17:53:00 2018 +0000 Bug 27865: Fix start-up crashes on Windows Don't bind --enable-release to MOZILLA_OFFICIAL for Windows targets as we are currently crashing on start-up for unknown reasons if --enable-release is set, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1470772. --- build/moz.configure/toolchain.configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 67007c8dcf7c..008193c6c945 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1382,8 +1382,10 @@ option(env='RUSTFLAGS', help='Rust compiler flags') set_config('RUSTFLAGS', depends('RUSTFLAGS')(lambda flags: flags)) - -imply_option('--enable-release', mozilla_official) +if target.os != 'WINNT': + imply_option('--enable-release', mozilla_official) +else: + imply_option('--enable-release', False) imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True)) js_option('--enable-release',

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 0c004047822a94a6e16851a9f46d237be10eebce Author: Stephen A Pohl <spohl.mozilla.bugs(a)gmail.com> Date: Sun Sep 30 01:02:08 2018 -0400 Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau --HG-- extra : source : 3920c858319dff66ebbc9263f6aa8d24f16071f8 extra : intermediate-source : d7a52857cd862b4e2f8305baddc119f4e9a47146 --- widget/cocoa/nsChildView.mm | 52 --------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 8ffafc5d148e..072d59d0c010 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -442,13 +442,6 @@ nsChildView::Create(nsIWidget* aParent, if (!gChildViewMethodsSwizzled) { nsToolkit::SwizzleMethods([NSView class], @selector(mouseDownCanMoveWindow), @selector(nsChildView_NSView_mouseDownCanMoveWindow)); -#ifdef __LP64__ - nsToolkit::SwizzleMethods([NSEvent class], @selector(addLocalMonitorForEventsMatchingMask:handler:), - @selector(nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:handler:), - true); - nsToolkit::SwizzleMethods([NSEvent class], @selector(removeMonitor:), - @selector(nsChildView_NSEvent_removeMonitor:), true); -#endif gChildViewMethodsSwizzled = true; } @@ -7134,48 +7127,3 @@ static const CGEventField kCGWindowNumberField = (const CGEventField) 51; } @end - -#ifdef __LP64__ -// When using blocks, at least on OS X 10.7, the OS sometimes calls -// +[NSEvent removeMonitor:] more than once on a single event monitor, which -// causes crashes. See bug 678607. We hook these methods to work around -// the problem. -@interface NSEvent (MethodSwizzling) -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block; -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor; -@end - -// This is a local copy of the AppKit frameworks sEventObservers hashtable. -// It only stores "local monitors". We use it to ensure that +[NSEvent -// removeMonitor:] is never called more than once on the same local monitor. -static NSHashTable *sLocalEventObservers = nil; - -@implementation NSEvent (MethodSwizzling) - -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block -{ - if (!sLocalEventObservers) { - sLocalEventObservers = [[NSHashTable hashTableWithOptions: - NSHashTableStrongMemory | NSHashTableObjectPointerPersonality] retain]; - } - id retval = - [self nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:mask handler:block]; - if (sLocalEventObservers && retval && ![sLocalEventObservers containsObject:retval]) { - [sLocalEventObservers addObject:retval]; - } - return retval; -} - -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor -{ - if (sLocalEventObservers && [eventMonitor isKindOfClass: ::NSClassFromString(@"_NSLocalEventObserver")]) { - if (![sLocalEventObservers containsObject:eventMonitor]) { - return; - } - [sLocalEventObservers removeObject:eventMonitor]; - } - [self nsChildView_NSEvent_removeMonitor:eventMonitor]; -} - -@end -#endif // #ifdef __LP64__

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1493900. r=bhackett, sunfish a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 34bcbdca41c7949318930b44b504e88696d0aeee Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:14:11 2018 +0200 Bug 1493900. r=bhackett,sunfish a=dveditz --HG-- extra : source : b5e3f4138c0ca0a2a42ec8007f27e1e7b6cb2150 extra : intermediate-source : d596c94e62cd99b7efa048cb8016368047aaa079 --- js/src/jit/BacktrackingAllocator.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/js/src/jit/BacktrackingAllocator.cpp b/js/src/jit/BacktrackingAllocator.cpp index 16f7ff56397c..414de92e5bbc 100644 --- a/js/src/jit/BacktrackingAllocator.cpp +++ b/js/src/jit/BacktrackingAllocator.cpp @@ -1930,8 +1930,16 @@ BacktrackingAllocator::resolveControlFlow() if (!alloc().ensureBallast()) return false; - if (!moveAtExit(predecessor, from, to, def->type())) - return false; + if (mSuccessor->numPredecessors() > 1) { + MOZ_ASSERT(predecessor->mir()->numSuccessors() == 1); + if (!moveAtExit(predecessor, from, to, def->type())) { + return false; + } + } else { + if (!moveAtEntry(successor, from, to, def->type())) { + return false; + } + } } } }

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 50e3be5d0c750483f8e2367cb8b8e0c3c26bba11 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:33:42 2018 +0200 Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz --HG-- extra : source : b193307614e2f56615e7b5fe5ca97c2f6638c29d extra : intermediate-source : dc688e0c970278799f4d0ca9bde78545380e4110 --- js/src/jit/MCallOptimize.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp index 2bee4b605280..1e600583c4cb 100644 --- a/js/src/jit/MCallOptimize.cpp +++ b/js/src/jit/MCallOptimize.cpp @@ -775,6 +775,12 @@ IonBuilder::inlineArrayPush(CallInfo& callInfo) return InliningStatus_NotInlined; } + // XXX bug 1493903. + if (callInfo.argc() != 1) { + trackOptimizationOutcome(TrackedOutcome::CantInlineNativeBadForm); + return InliningStatus_NotInlined; + } + MDefinition* obj = convertUnboxedObjects(callInfo.thisArg()); for (uint32_t i = 0; i < callInfo.argc(); i++) { MDefinition* value = callInfo.getArg(i);

1 0

[tor/master] Merge remote-tracking branch 'public/bug27893'
by nickm＠torproject.org 01 Oct '18

01 Oct '18

commit 43211c3a0c4b56d4100daf3a541250b953fb7230 Merge: 58299b292 8812f562a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 1 12:12:33 2018 -0500 Merge remote-tracking branch 'public/bug27893' changes/bug27893 | 3 +++ src/app/config/config.c | 9 +++++++++ src/app/config/confparse.c | 5 +++-- src/app/config/confparse.h | 4 ++++ src/app/config/statefile.c | 9 +++++++++ src/feature/dirauth/shared_random_state.c | 8 ++++++++ 6 files changed, 36 insertions(+), 2 deletions(-)

1 0