commit d7afde7b17d33f18074c57d1baa3be25d417bc58 Author: Mike Perry <mikeperry-git@fscked.org> Date: Sun Feb 10 18:37:28 2013 -0800 Move proxy preference setting earlier. Defensive-coding measure. We're probably just going to make our SOCKS port fixed instead. --- src/components/startup-observer.js | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index cc5bcd6..e298f78 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -46,6 +46,15 @@ function StartupObserver() { this.logger.log(3, "This is not a Tor Browser's XPCOM"); } + try { + // XXX: We're in a race with HTTPS-Everywhere to update our proxy settings + // before the initial SSL-Observatory test... If we lose the race, Firefox + // caches the old proxy settings for check.tp.o somehwere, and it never loads :( + this.setProxySettings(); + } catch(e) { + this.logger.log(4, "Early proxy change failed. Will try again at profile load. Error: "+e); + } + // Bug 1506 P2/P3: You probably want to register this observer to clean up // prefs if you're going to support using normal firefox. Components.utils.import("resource://gre/modules/AddonManager.jsm");