[tor-commits] [meek/master] Import the console from resource://gre/modules/Console.jsm.

[dcf at torproject.org]

commit 404a458b798dc7630246062042050f621356e511
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Jul 15 22:53:15 2018 -0700

    Import the console from resource://gre/modules/Console.jsm.
    
    The previous path had an additional "devtools/":
    resource://gre/modules/devtools/Console.jsm
    
    The current documentation gives the path without "devtools/":
    https://developer.mozilla.org/en-US/docs/Tools/Browser_Console#Console.jsm
    
    The path seems to have changed in ESR58, thereby breaking the extension:
    https://bugs.torproject.org/26118
    https://bugs.torproject.org/26477#comment:2
---
 firefox/components/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firefox/components/main.js b/firefox/components/main.js
index e892c4b..835cdf3 100644
--- a/firefox/components/main.js
+++ b/firefox/components/main.js
@@ -40,7 +40,7 @@
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 // https://developer.mozilla.org/en-US/docs/Tools/Browser_Console#Console.jsm
-Components.utils.import("resource://gre/modules/devtools/Console.jsm");
+Components.utils.import("resource://gre/modules/Console.jsm");
 
 // Everything resides within the MeekHTTPHelper namespace. MeekHTTPHelper is
 // also the type from which NSGetFactory is constructed, and it is the top-level