[gentoo-commits] gentoo-x86 commit in www-client/torbrowser/files/torbrowser-patches: 0001-Block-Components.interfaces-lookupMethod-from-conten.patch 0011-Make-Download-manager-memory-only.patch 0020-Fix-internal-compile-error-for-sub-ancient-GCCs.patch 0005-Block-all-plugins-except-flash.patch 0009-Limit-device-and-system-specific-CSS-Media-Queries.patch 0010-Rebrand-Firefox-to-TorBrowser.patch 0015-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch 0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch 0007-Disable-SSL-Session-ID-tracking.patch 0003-Make-Intermediate-Cert-Store-memory-only.patch 0008-Provide-an-observer-event-to-close-persistent-connec.patch 0004-Add-a-string-based-cacheKey.patch 0019-Fix-Firefox-13-build-process.patch 0012-Add-DDG-and-StartPage-to-Omnibox.patch 0016-Limit-the-number-of-fonts-per-document.patch 0017-Randomize-HTTP-request-order-and-pipeline-depth.patch 0006-Make-content-pref-service-memory-only-clearable.patch 0002-Make-Permi ssions-Manager-me mory-only.patch 0014-Prevent-WebSocket-DNS-leak.patch 0013-Make-nsICacheService.EvictEntries-synchronous.patch 0013-Make-Download-manager-memory-only.patch 0015-Make-nsICacheService.EvictEntries-synchronous.patch 0008-Disable-SSL-Session-ID-tracking.patch 0011-Limit-the-number-of-fonts-per-document.patch 0009-Provide-an-observer-event-to-close-persistent-connec.patch 0012-Rebrand-Firefox-to-TorBrowser.patch 0010-Provide-client-values-only-to-CSS-Media-Queries.patch 0016-Prevent-WebSocket-DNS-leak.patch 0018-Add-HTTP-auth-headers-before-the-modify-request-obse.patch 0014-Add-DDG-and-StartPage-to-Omnibox.patch 0007-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch

[Julian Ospald (hasufell)]

hasufell    12/06/30 20:43:10

  Modified:            
                        0001-Block-Components.interfaces-lookupMethod-from-conten.patch
                        0005-Block-all-plugins-except-flash.patch
                        0003-Make-Intermediate-Cert-Store-memory-only.patch
                        0004-Add-a-string-based-cacheKey.patch
                        0017-Randomize-HTTP-request-order-and-pipeline-depth.patch
                        0006-Make-content-pref-service-memory-only-clearable.patch
                        0002-Make-Permissions-Manager-memory-only.patch
  Added:                0011-Make-Download-manager-memory-only.patch
                        0020-Fix-internal-compile-error-for-sub-ancient-GCCs.patch
                        0009-Limit-device-and-system-specific-CSS-Media-Queries.patch
                        0010-Rebrand-Firefox-to-TorBrowser.patch
                        0015-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch
                        0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch
                        0007-Disable-SSL-Session-ID-tracking.patch
                        0008-Provide-an-observer-event-to-close-persistent-connec.patch
                        0019-Fix-Firefox-13-build-process.patch
                        0012-Add-DDG-and-StartPage-to-Omnibox.patch
                        0016-Limit-the-number-of-fonts-per-document.patch
                        0014-Prevent-WebSocket-DNS-leak.patch
                        0013-Make-nsICacheService.EvictEntries-synchronous.patch
  Removed:              0013-Make-Download-manager-memory-only.patch
                        0015-Make-nsICacheService.EvictEntries-synchronous.patch
                        0008-Disable-SSL-Session-ID-tracking.patch
                        0011-Limit-the-number-of-fonts-per-document.patch
                        0009-Provide-an-observer-event-to-close-persistent-connec.patch
                        0012-Rebrand-Firefox-to-TorBrowser.patch
                        0010-Provide-client-values-only-to-CSS-Media-Queries.patch
                        0016-Prevent-WebSocket-DNS-leak.patch
                        0018-Add-HTTP-auth-headers-before-the-modify-request-obse.patch
                        0014-Add-DDG-and-StartPage-to-Omnibox.patch
                        0007-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch
  Log:
  version bump, also fixes bug #423343
  
  (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  www-client/torbrowser/files/torbrowser-patches/0001-Block-Components.interfaces-lookupMethod-from-conten.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0001-Block-Components.interfaces-lookupMethod-from-conten.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0001-Block-Components.interfaces-lookupMethod-from-conten.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0001-Block-Components.interfaces-lookupMethod-from-conten.patch?r1=1.1&r2=1.2

Index: 0001-Block-Components.interfaces-lookupMethod-from-conten.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0001-Block-Components.interfaces-lookupMethod-from-conten.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-Block-Components.interfaces-lookupMethod-from-conten.patch	6 Jun 2012 22:21:08 -0000	1.1
+++ 0001-Block-Components.interfaces-lookupMethod-from-conten.patch	30 Jun 2012 20:43:10 -0000	1.2
@@ -1,7 +1,7 @@
-From 18fea351a9f218893514ccbca82c492ce81d038d Mon Sep 17 00:00:00 2001
+From 801d2dcc512ca5e64b72d56faaab7d8ef0fadf39 Mon Sep 17 00:00:00 2001
 From: Mike Perry <mikeperry-git@××××××××××.org>
 Date: Wed, 1 Feb 2012 15:40:40 -0800
-Subject: [PATCH 01/18] Block Components.interfaces,lookupMethod from content
+Subject: [PATCH 01/20] Block Components.interfaces,lookupMethod from content
 
 This patch removes the ability of content script to access
 Components.interfaces.* as well as call or access Components.lookupMethod.
@@ -20,10 +20,10 @@
  1 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
-index 3bcbf91..d5c020a 100644
+index a2a1102..49e4c7e 100644
 --- a/js/xpconnect/src/XPCComponents.cpp
 +++ b/js/xpconnect/src/XPCComponents.cpp
-@@ -4456,7 +4456,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval)
+@@ -4287,7 +4287,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval)
  NS_IMETHODIMP
  nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval)
  {
@@ -34,7 +34,7 @@
      *_retval = xpc_CheckAccessList(methodName, allowed);
      return NS_OK;
  }
-@@ -4465,7 +4467,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c
+@@ -4296,7 +4298,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c
  NS_IMETHODIMP
  nsXPCComponents::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval)
  {



1.2                  www-client/torbrowser/files/torbrowser-patches/0005-Block-all-plugins-except-flash.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0005-Block-all-plugins-except-flash.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0005-Block-all-plugins-except-flash.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0005-Block-all-plugins-except-flash.patch?r1=1.1&r2=1.2

Index: 0005-Block-all-plugins-except-flash.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0005-Block-all-plugins-except-flash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0005-Block-all-plugins-except-flash.patch	6 Jun 2012 22:21:08 -0000	1.1
+++ 0005-Block-all-plugins-except-flash.patch	30 Jun 2012 20:43:10 -0000	1.2
@@ -1,7 +1,7 @@
-From 3457f78e346df5962449cbd5aa86624e19fd5f64 Mon Sep 17 00:00:00 2001
+From 47235106c9e1257c66bab774aab330be4dabcfb0 Mon Sep 17 00:00:00 2001
 From: Mike Perry <mikeperry-git@××××××××××.org>
 Date: Wed, 1 Feb 2012 15:50:15 -0800
-Subject: [PATCH 05/18] Block all plugins except flash.
+Subject: [PATCH 05/20] Block all plugins except flash.
 
 We cannot use the @mozilla.org/extensions/blocklist;1 service, because we
 actually want to stop plugins from ever entering the browser's process space
@@ -17,10 +17,10 @@
  2 files changed, 35 insertions(+), 0 deletions(-)
 
 diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
-index 992bcd4..f56f231 100644
+index 0c3efa0..e607e68 100644
 --- a/dom/plugins/base/nsPluginHost.cpp
 +++ b/dom/plugins/base/nsPluginHost.cpp
-@@ -1968,6 +1968,35 @@ bool nsPluginHost::IsDuplicatePlugin(nsPluginTag * aPluginTag)
+@@ -2002,6 +2002,35 @@ bool nsPluginHost::IsDuplicatePlugin(nsPluginTag * aPluginTag)
    return false;
  }
  
@@ -56,7 +56,7 @@
  typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void);
  
  nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
-@@ -2101,6 +2130,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
+@@ -2135,6 +2164,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
        continue;
      }
  
@@ -68,10 +68,10 @@
      if (!pluginTag) {
        nsPluginFile pluginFile(localfile);
 diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h
-index 39a8891..c262abf 100644
+index 1b46957..4f1e890 100644
 --- a/dom/plugins/base/nsPluginHost.h
 +++ b/dom/plugins/base/nsPluginHost.h
-@@ -278,6 +278,8 @@ private:
+@@ -285,6 +285,8 @@ private:
    // Loads all cached plugins info into mCachedPlugins
    nsresult ReadPluginInfo();
  



1.2                  www-client/torbrowser/files/torbrowser-patches/0003-Make-Intermediate-Cert-Store-memory-only.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0003-Make-Intermediate-Cert-Store-memory-only.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0003-Make-Intermediate-Cert-Store-memory-only.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0003-Make-Intermediate-Cert-Store-memory-only.patch?r1=1.1&r2=1.2

Index: 0003-Make-Intermediate-Cert-Store-memory-only.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0003-Make-Intermediate-Cert-Store-memory-only.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0003-Make-Intermediate-Cert-Store-memory-only.patch	6 Jun 2012 22:21:08 -0000	1.1
+++ 0003-Make-Intermediate-Cert-Store-memory-only.patch	30 Jun 2012 20:43:10 -0000	1.2
@@ -1,7 +1,7 @@
-From e6d127b805461470bff0dad12f5ad89fc3cd3df3 Mon Sep 17 00:00:00 2001
+From 6b5b4816ffff9875f8fd3364841fde872a2af7a4 Mon Sep 17 00:00:00 2001
 From: Mike Perry <mikeperry-git@××××××.org>
 Date: Fri, 19 Aug 2011 17:58:23 -0700
-Subject: [PATCH 03/18] Make Intermediate Cert Store memory-only.
+Subject: [PATCH 03/20] Make Intermediate Cert Store memory-only.
 
 This patch makes the intermediate SSL cert store exist in memory only.
 
@@ -12,10 +12,10 @@
  1 files changed, 14 insertions(+), 1 deletions(-)
 
 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
-index a08c4ef..0ec3713 100644
+index 89ad70e..783d0d2 100644
 --- a/security/manager/ssl/src/nsNSSComponent.cpp
 +++ b/security/manager/ssl/src/nsNSSComponent.cpp
-@@ -1730,8 +1730,21 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
+@@ -1755,8 +1755,21 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
      // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as
      // "/usr/lib/nss/libnssckbi.so".
      PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;



1.2                  www-client/torbrowser/files/torbrowser-patches/0004-Add-a-string-based-cacheKey.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0004-Add-a-string-based-cacheKey.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0004-Add-a-string-based-cacheKey.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0004-Add-a-string-based-cacheKey.patch?r1=1.1&r2=1.2

Index: 0004-Add-a-string-based-cacheKey.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0004-Add-a-string-based-cacheKey.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0004-Add-a-string-based-cacheKey.patch	6 Jun 2012 22:21:08 -0000	1.1
+++ 0004-Add-a-string-based-cacheKey.patch	30 Jun 2012 20:43:10 -0000	1.2
@@ -1,7 +1,7 @@
-From 84668dfe7bdcd35d96ffcaf273ade5a5d8d470f8 Mon Sep 17 00:00:00 2001
+From b2dfbf250bc83592e73abf932c5301f1688a277b Mon Sep 17 00:00:00 2001
 From: Mike Perry <mikeperry-git@××××××.org>
 Date: Fri, 2 Sep 2011 20:47:02 -0700
-Subject: [PATCH 04/18] Add a string-based cacheKey.
+Subject: [PATCH 04/20] Add a string-based cacheKey.
 
 Used for isolating cache according to same-origin policy.
 ---
@@ -29,10 +29,10 @@
       * may fail if the disk cache is not present.  The value of this attribute
       * is usually only settable during the processing of a channel's
 diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
-index dec2a83..97bd84c 100644
+index 34291f4..92f2d7d 100644
 --- a/netwerk/protocol/http/nsHttpChannel.cpp
 +++ b/netwerk/protocol/http/nsHttpChannel.cpp
-@@ -2392,6 +2392,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID,
+@@ -2415,6 +2415,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID,
          cacheKey.Append(buf);
      }
  
@@ -45,7 +45,7 @@
      if (!cacheKey.IsEmpty()) {
          cacheKey.AppendLiteral("uri=");
      }
-@@ -4695,6 +4701,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value)
+@@ -4784,6 +4790,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value)
  }
  
  NS_IMETHODIMP
@@ -69,10 +69,10 @@
  {
      value = mOfflineCacheClientID;
 diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
-index 88ce469..53538cf 100644
+index f8e59fe..a5b7d1e 100644
 --- a/netwerk/protocol/http/nsHttpChannel.h
 +++ b/netwerk/protocol/http/nsHttpChannel.h
-@@ -303,6 +303,7 @@ private:
+@@ -306,6 +306,7 @@ private:
      nsCOMPtr<nsICacheEntryDescriptor> mOfflineCacheEntry;
      nsCacheAccessMode                 mOfflineCacheAccess;
      nsCString                         mOfflineCacheClientID;



1.2                  www-client/torbrowser/files/torbrowser-patches/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch?r1=1.1&r2=1.2

Index: 0017-Randomize-HTTP-request-order-and-pipeline-depth.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0017-Randomize-HTTP-request-order-and-pipeline-depth.patch	6 Jun 2012 22:21:08 -0000	1.1
+++ 0017-Randomize-HTTP-request-order-and-pipeline-depth.patch	30 Jun 2012 20:43:10 -0000	1.2
@@ -1,7 +1,7 @@
-From 60d369378ea65b1502ba2ab28a851318e7910a64 Mon Sep 17 00:00:00 2001
+From 09c27d0aee130959ee1aae211e9400600c26ade6 Mon Sep 17 00:00:00 2001
 From: Mike Perry <mikeperry-git@××××××××××.org>
-Date: Wed, 6 Jun 2012 11:08:56 -0700
-Subject: [PATCH 17/18] Randomize HTTP request order and pipeline depth.
+Date: Thu, 7 Jun 2012 15:13:45 -0700
+Subject: [PATCH 17/20] Randomize HTTP request order and pipeline depth.
 
 This is an experimental defense against
 http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf
@@ -17,13 +17,13 @@
  2 files changed, 136 insertions(+), 5 deletions(-)
 
 diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
-index 23ef893..788368f 100644
+index 463584f..e05669c 100644
 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
 +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
-@@ -94,6 +94,12 @@ nsHttpConnectionMgr::nsHttpConnectionMgr()
- {
-     LOG(("Creating nsHttpConnectionMgr @%x\n", this));
+@@ -101,6 +101,12 @@ nsHttpConnectionMgr::nsHttpConnectionMgr()
      mCT.Init();
+     mAlternateProtocolHash.Init(16);
+     mSpdyPreferredHash.Init();
 +
 +    nsresult rv;
 +    mRandomGenerator = do_GetService("@mozilla.org/security/random-generator;1", &rv);
@@ -33,7 +33,7 @@
  }
  
  nsHttpConnectionMgr::~nsHttpConnectionMgr()
-@@ -342,8 +348,12 @@ nsHttpConnectionMgr::AddTransactionToPipeline(nsHttpPipeline *pipeline)
+@@ -380,8 +386,12 @@ nsHttpConnectionMgr::AddTransactionToPipeline(nsHttpPipeline *pipeline)
          nsConnectionEntry *ent = mCT.Get(ci->HashKey());
          if (ent) {
              // search for another request to pipeline...
@@ -48,7 +48,7 @@
                  nsHttpTransaction *trans = ent->mPendingQ[i];
                  if (trans->Caps() & NS_HTTP_ALLOW_PIPELINING) {
                      pipeline->AddTransaction(trans);
-@@ -354,6 +364,8 @@ nsHttpConnectionMgr::AddTransactionToPipeline(nsHttpPipeline *pipeline)
+@@ -392,6 +402,8 @@ nsHttpConnectionMgr::AddTransactionToPipeline(nsHttpPipeline *pipeline)
                      break;
                  }
              }
@@ -57,17 +57,17 @@
          }
      }
  }
-@@ -585,12 +597,17 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent)
-     LOG(("nsHttpConnectionMgr::ProcessPendingQForEntry [ci=%s]\n",
-         ent->mConnInfo->HashKey().get()));
+@@ -922,12 +934,17 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent)
+ 
+     ProcessSpdyPendingQ(ent);
  
--    PRInt32 i, count = ent->mPendingQ.Length();
+-    PRUint32 i, count = ent->mPendingQ.Length();
 +    PRUint32 h, i = 0, count = ent->mPendingQ.Length();
      if (count > 0) {
          LOG(("  pending-count=%u\n", count));
          nsHttpTransaction *trans = nsnull;
          nsHttpConnection *conn = nsnull;
--        for (i=0; i<count; ++i) {
+-        for (i = 0; i < count; ++i) {
 +
 +        PRUint32* ind = new PRUint32[count];
 +        ShuffleRequestOrder(ind, count);
@@ -77,22 +77,22 @@
              trans = ent->mPendingQ[i];
  
              // When this transaction has already established a half-open
-@@ -610,6 +627,7 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent)
-             if (conn)
-                 break;
+@@ -951,6 +968,7 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent)
+                               "something mutated pending queue from "
+                               "GetConnection()");
          }
 +        delete [] ind;
          if (conn) {
              LOG(("  dispatching pending transaction...\n"));
  
-@@ -694,6 +712,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap
+@@ -1035,6 +1053,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap
          maxPersistConns = mMaxPersistConnsPerHost;
      }
  
 +    // Fuzz maxConns for website fingerprinting attack
 +    // We create a range of maxConns/5 up to 6*maxConns/5 
 +    // because this function is called repeatedly, and we'll
-+    // end up converging to the high side of concurrent connections
++    // end up converging on a the high side of concurrent connections
 +    // after a short while. 
 +    PRUint8 *bytes = nsnull;
 +    nsresult rv = mRandomGenerator->GenerateRandomBytes(1, &bytes);
@@ -105,8 +105,8 @@
      // use >= just to be safe
      return (totalCount >= maxConns) || ( (caps & NS_HTTP_ALLOW_KEEPALIVE) &&
                                           (persistCount >= maxPersistConns) );
-@@ -865,7 +896,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent,
-     nsHttpPipeline *pipeline = nsnull;
+@@ -1274,7 +1305,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent,
+ 
      if (conn->SupportsPipelining() && (caps & NS_HTTP_ALLOW_PIPELINING)) {
          LOG(("  looking to build pipeline...\n"));
 -        if (BuildPipeline(ent, trans, &pipeline))
@@ -114,7 +114,7 @@
              trans = pipeline;
      }
  
-@@ -938,6 +969,101 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent,
+@@ -1349,6 +1380,101 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent,
      return true;
  }
  
@@ -217,19 +217,19 @@
  nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans)
  {
 diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h
-index cdf21a9..81b282a 100644
+index 6b4398b..c33870f 100644
 --- a/netwerk/protocol/http/nsHttpConnectionMgr.h
 +++ b/netwerk/protocol/http/nsHttpConnectionMgr.h
-@@ -51,6 +51,7 @@
- 
+@@ -53,6 +53,7 @@
  #include "nsIObserver.h"
  #include "nsITimer.h"
+ #include "nsIX509Cert3.h"
 +#include "nsIRandomGenerator.h"
  
  class nsHttpPipeline;
  
-@@ -276,6 +277,8 @@ private:
-     nsresult DispatchTransaction(nsConnectionEntry *, nsAHttpTransaction *,
+@@ -320,6 +321,8 @@ private:
+     nsresult DispatchTransaction(nsConnectionEntry *, nsHttpTransaction *,
                                   PRUint8 caps, nsHttpConnection *);
      bool     BuildPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **);
 +    bool     BuildRandomizedPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **);
@@ -237,15 +237,15 @@
      nsresult ProcessNewTransaction(nsHttpTransaction *);
      nsresult EnsureSocketThreadTargetIfOnline();
      void     ClosePersistentConnections(nsConnectionEntry *ent);
-@@ -353,6 +356,8 @@ private:
+@@ -412,6 +415,8 @@ private:
      PRUint64 mTimeOfNextWakeUp;
      // Timer for next pruning of dead connections.
      nsCOMPtr<nsITimer> mTimer;
 +    // Random number generator for reordering HTTP pipeline
 +    nsCOMPtr<nsIRandomGenerator>             mRandomGenerator;
  
-     //
-     // the connection table
+     // A 1s tick to call nsHttpConnection::ReadTimeoutTick on
+     // active http/1 connections. Disabled when there are no
 -- 
 1.7.5.4
 



1.2                  www-client/torbrowser/files/torbrowser-patches/0006-Make-content-pref-service-memory-only-clearable.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0006-Make-content-pref-service-memory-only-clearable.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0006-Make-content-pref-service-memory-only-clearable.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0006-Make-content-pref-service-memory-only-clearable.patch?r1=1.1&r2=1.2

Index: 0006-Make-content-pref-service-memory-only-clearable.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0006-Make-content-pref-service-memory-only-clearable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0006-Make-content-pref-service-memory-only-clearable.patch	6 Jun 2012 22:21:08 -0000	1.1
+++ 0006-Make-content-pref-service-memory-only-clearable.patch	30 Jun 2012 20:43:10 -0000	1.2
@@ -1,7 +1,7 @@
-From 66ff6c30d5b1de5d549181acbba686f792fe4cb4 Mon Sep 17 00:00:00 2001
+From bd560666419266a862d5b0387c7941c8ef7bb624 Mon Sep 17 00:00:00 2001
 From: Mike Perry <mikeperry-git@××××××.org>
 Date: Thu, 8 Sep 2011 08:40:17 -0700
-Subject: [PATCH 06/18] Make content pref service memory-only + clearable
+Subject: [PATCH 06/20] Make content pref service memory-only + clearable
 
 This prevents random urls from being inserted into content-prefs.sqllite in
 the profile directory as content prefs change (includes site-zoom and perhaps
@@ -11,10 +11,10 @@
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/toolkit/components/contentprefs/nsContentPrefService.js b/toolkit/components/contentprefs/nsContentPrefService.js
-index adfb650..1619d5f 100644
+index 68a5561..effc33c 100644
 --- a/toolkit/components/contentprefs/nsContentPrefService.js
 +++ b/toolkit/components/contentprefs/nsContentPrefService.js
-@@ -1240,7 +1240,7 @@ ContentPrefService.prototype = {
+@@ -1242,7 +1242,7 @@ ContentPrefService.prototype = {
  
      var dbConnection;
  
@@ -23,7 +23,7 @@
        dbConnection = this._dbCreate(dbService, dbFile);
      else {
        try {
-@@ -1288,7 +1288,7 @@ ContentPrefService.prototype = {
+@@ -1290,7 +1290,7 @@ ContentPrefService.prototype = {
    },
  
    _dbCreate: function ContentPrefService__dbCreate(aDBService, aDBFile) {



1.2                  www-client/torbrowser/files/torbrowser-patches/0002-Make-Permissions-Manager-memory-only.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0002-Make-Permissions-Manager-memory-only.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0002-Make-Permissions-Manager-memory-only.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0002-Make-Permissions-Manager-memory-only.patch?r1=1.1&r2=1.2

Index: 0002-Make-Permissions-Manager-memory-only.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0002-Make-Permissions-Manager-memory-only.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0002-Make-Permissions-Manager-memory-only.patch	6 Jun 2012 22:21:08 -0000	1.1
+++ 0002-Make-Permissions-Manager-memory-only.patch	30 Jun 2012 20:43:10 -0000	1.2
@@ -1,7 +1,7 @@
-From 336217485d707ff63ef42d2a0bc3705c2c7f7a3c Mon Sep 17 00:00:00 2001
+From 4c65de64fc28ca767009a0d0acfcefd8f2a73ad8 Mon Sep 17 00:00:00 2001
 From: Mike Perry <mikeperry-git@××××××××××.org>
 Date: Wed, 1 Feb 2012 15:45:16 -0800
-Subject: [PATCH 02/18] Make Permissions Manager memory-only
+Subject: [PATCH 02/20] Make Permissions Manager memory-only
 
 This patch exposes a pref 'permissions.memory_only' that properly isolates the
 permissions manager to memory, which is responsible for all user specified
@@ -16,7 +16,7 @@
  1 files changed, 31 insertions(+), 3 deletions(-)
 
 diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp
-index 67eb216..12cc7cf 100644
+index cdfe21b..a7a0efb 100644
 --- a/extensions/cookie/nsPermissionManager.cpp
 +++ b/extensions/cookie/nsPermissionManager.cpp
 @@ -58,6 +58,10 @@
@@ -75,7 +75,7 @@
      NS_ENSURE_SUCCESS(rv, rv);
  
      mDBConn->GetConnectionReady(&ready);
-@@ -783,7 +806,12 @@ NS_IMETHODIMP nsPermissionManager::Observe(nsISupports *aSubject, const char *aT
+@@ -794,7 +817,12 @@ NS_IMETHODIMP nsPermissionManager::Observe(nsISupports *aSubject, const char *aT
  {
    ENSURE_NOT_CHILD_PROCESS;
  



1.1                  www-client/torbrowser/files/torbrowser-patches/0011-Make-Download-manager-memory-only.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0011-Make-Download-manager-memory-only.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0011-Make-Download-manager-memory-only.patch?rev=1.1&content-type=text/plain

Index: 0011-Make-Download-manager-memory-only.patch
===================================================================
From 8992ae1cb7e1545413e649027ab7827799c53300 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××××××.org>
Date: Wed, 25 Apr 2012 13:39:35 -0700
Subject: [PATCH 11/20] Make Download manager memory only.

Solves https://trac.torproject.org/projects/tor/ticket/4017.

Yes, this is an ugly hack. We *could* send the observer notification from
Torbutton to tell the download manager to switch to memory, but then we have
to dance around and tell it again if the user switches in and out of private
browsing mode..

The right way to do this is with a pref. Maybe I'll get to that someday, if
this breaks enough times in conflict.
---
 toolkit/components/downloads/nsDownloadManager.cpp |    4 ++--
 toolkit/components/downloads/nsDownloadManager.h   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
index cb1f1f6..1de653b 100644
--- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -1999,7 +1999,7 @@ nsDownloadManager::Observe(nsISupports *aSubject,
     if (NS_LITERAL_STRING("memory").Equals(aData))
       return SwitchDatabaseTypeTo(DATABASE_MEMORY);
     else if (NS_LITERAL_STRING("disk").Equals(aData))
-      return SwitchDatabaseTypeTo(DATABASE_DISK);
+      return SwitchDatabaseTypeTo(DATABASE_MEMORY);
   }
   else if (strcmp(aTopic, "alertclickcallback") == 0) {
     nsCOMPtr<nsIDownloadManagerUI> dmui =
@@ -2076,7 +2076,7 @@ nsDownloadManager::OnLeavePrivateBrowsingMode()
   (void)ResumeAllDownloads(false);
 
   // Switch back to the on-disk DB again
-  (void)SwitchDatabaseTypeTo(DATABASE_DISK);
+  //(void)SwitchDatabaseTypeTo(DATABASE_DISK);
 
   mInPrivateBrowsing = false;
 }
diff --git a/toolkit/components/downloads/nsDownloadManager.h b/toolkit/components/downloads/nsDownloadManager.h
index 16a861e..e729cbf 100644
--- a/toolkit/components/downloads/nsDownloadManager.h
+++ b/toolkit/components/downloads/nsDownloadManager.h
@@ -92,7 +92,7 @@ public:
 
   virtual ~nsDownloadManager();
   nsDownloadManager() :
-      mDBType(DATABASE_DISK)
+      mDBType(DATABASE_MEMORY)
     , mInPrivateBrowsing(false)
 #ifdef DOWNLOAD_SCANNER
     , mScanner(nsnull)
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0020-Fix-internal-compile-error-for-sub-ancient-GCCs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0020-Fix-internal-compile-error-for-sub-ancient-GCCs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0020-Fix-internal-compile-error-for-sub-ancient-GCCs.patch?rev=1.1&content-type=text/plain

Index: 0020-Fix-internal-compile-error-for-sub-ancient-GCCs.patch
===================================================================
From fb210909f6fd3a4a5253101d44edc8c884bf6c04 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××××××.org>
Date: Wed, 20 Jun 2012 15:26:11 -0700
Subject: [PATCH 20/20] Fix 'internal compile error' for sub-ancient GCCs.

Also fix a related null pointer deref.
---
 netwerk/protocol/http/HttpChannelParent.cpp |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index c0d2fff..982c4e0 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -333,8 +333,13 @@ HttpChannelParent::RecvUpdateAssociatedContentSecurity(const PRInt32& high,
 
 // Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be
 // merged to a single address.
-#pragma warning(disable : 4068)
+// Compiling with a version of GCC <= 4.4 fails with an internal compiler
+// error.
+#if !defined(__GNUC__) || \
+      (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
 #pragma GCC optimize ("O0")
+#pragma warning(disable : 4068)
+#endif
 
 bool
 HttpChannelParent::RecvRedirect2Verify(const nsresult& result, 
@@ -369,8 +374,10 @@ HttpChannelParent::RecvRedirect2Verify(const nsresult& result,
 
   mReceivedRedirect2Verify = true;
 
-  mRedirectCallback->OnRedirectVerifyCallback(result);
-  mRedirectCallback = nsnull;
+  if (mRedirectCallback) {
+    mRedirectCallback->OnRedirectVerifyCallback(result);
+    mRedirectCallback = nsnull;
+  }
   return true;
 }
 
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0009-Limit-device-and-system-specific-CSS-Media-Queries.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0009-Limit-device-and-system-specific-CSS-Media-Queries.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0009-Limit-device-and-system-specific-CSS-Media-Queries.patch?rev=1.1&content-type=text/plain

Index: 0009-Limit-device-and-system-specific-CSS-Media-Queries.patch
===================================================================
From 6c09a21d1db29dc28b359294ededc047ba5b463e Mon Sep 17 00:00:00 2001
From: Shondoit Walker <shondoit@×××××.com>
Date: Mon, 4 Jun 2012 19:15:31 +0200
Subject: [PATCH 09/20] Limit device- and system-specific CSS Media Queries

This is done to address
https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linkability

This also fixes bug #4795 by making queries still available for chrome windows,
whilst returning nothing or non-device-specific values for web pages or extensions.
---
 layout/style/nsMediaFeatures.cpp |   42 ++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
index 6eca06e..25735e8 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -130,6 +130,9 @@ GetDeviceContextFor(nsPresContext* aPresContext)
 static nsSize
 GetDeviceSize(nsPresContext* aPresContext)
 {
+  if (!aPresContext->IsChrome()) {
+    return GetSize(aPresContext);
+  } else {
     nsSize size;
     if (aPresContext->IsRootPaginatedDocument())
         // We want the page size, including unprintable areas and margins.
@@ -140,6 +143,7 @@ GetDeviceSize(nsPresContext* aPresContext)
         GetDeviceContextFor(aPresContext)->
             GetDeviceSurfaceDimensions(size.width, size.height);
     return size;
+  }
 }
 
 static nsresult
@@ -183,17 +187,17 @@ static nsresult
 GetDeviceOrientation(nsPresContext* aPresContext, const nsMediaFeature*,
                      nsCSSValue& aResult)
 {
-    nsSize size = GetDeviceSize(aPresContext);
-    PRInt32 orientation;
-    if (size.width > size.height) {
-        orientation = NS_STYLE_ORIENTATION_LANDSCAPE;
-    } else {
-        // Per spec, square viewports should be 'portrait'
-        orientation = NS_STYLE_ORIENTATION_PORTRAIT;
-    }
-
-    aResult.SetIntValue(orientation, eCSSUnit_Enumerated);
-    return NS_OK;
+  nsSize size = GetDeviceSize(aPresContext);
+  PRInt32 orientation;
+  if (size.width > size.height) {
+      orientation = NS_STYLE_ORIENTATION_LANDSCAPE;
+  } else {
+      // Per spec, square viewports should be 'portrait'
+      orientation = NS_STYLE_ORIENTATION_PORTRAIT;
+  }
+
+  aResult.SetIntValue(orientation, eCSSUnit_Enumerated);
+  return NS_OK;
 }
 
 static nsresult
@@ -311,8 +315,12 @@ static nsresult
 GetDevicePixelRatio(nsPresContext* aPresContext, const nsMediaFeature*,
                     nsCSSValue& aResult)
 {
-  float ratio = aPresContext->CSSPixelsToDevPixels(1.0f);
-  aResult.SetFloatValue(ratio, eCSSUnit_Number);
+  if (aPresContext->IsChrome()) {
+    float ratio = aPresContext->CSSPixelsToDevPixels(1.0f);
+    aResult.SetFloatValue(ratio, eCSSUnit_Number);
+  } else {
+    aResult.SetFloatValue(1.0, eCSSUnit_Number);
+  }
   return NS_OK;
 }
 
@@ -320,18 +328,21 @@ static nsresult
 GetSystemMetric(nsPresContext* aPresContext, const nsMediaFeature* aFeature,
                 nsCSSValue& aResult)
 {
+  if (aPresContext->IsChrome()) {
     NS_ABORT_IF_FALSE(aFeature->mValueType == nsMediaFeature::eBoolInteger,
                       "unexpected type");
     nsIAtom *metricAtom = *aFeature->mData.mMetric;
     bool hasMetric = nsCSSRuleProcessor::HasSystemMetric(metricAtom);
     aResult.SetIntValue(hasMetric ? 1 : 0, eCSSUnit_Integer);
-    return NS_OK;
+  }
+  return NS_OK;
 }
 
 static nsresult
 GetWindowsTheme(nsPresContext* aPresContext, const nsMediaFeature* aFeature,
                 nsCSSValue& aResult)
 {
+  if (aPresContext->IsChrome()) {
     aResult.Reset();
 #ifdef XP_WIN
     PRUint8 windowsThemeId =
@@ -350,7 +361,8 @@ GetWindowsTheme(nsPresContext* aPresContext, const nsMediaFeature* aFeature,
         }
     }
 #endif
-    return NS_OK;
+  }
+  return NS_OK;
 }
 
 /*
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0010-Rebrand-Firefox-to-TorBrowser.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0010-Rebrand-Firefox-to-TorBrowser.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0010-Rebrand-Firefox-to-TorBrowser.patch?rev=1.1&content-type=text/plain

Index: 0010-Rebrand-Firefox-to-TorBrowser.patch
===================================================================
From 622437f3baf410f14610b21bcca7f9a0fcc8c6d9 Mon Sep 17 00:00:00 2001
From: Erinn Clark <erinn@××××××××××.org>
Date: Wed, 25 Apr 2012 09:14:00 -0300
Subject: [PATCH 10/20] Rebrand Firefox to TorBrowser

This patch does some basic renaming of Firefox to TorBrowser. The rest of the
branding is done by images and icons.
---
 browser/branding/official/configure.sh             |    2 +-
 browser/branding/official/locales/en-US/brand.dtd  |    6 +++---
 .../official/locales/en-US/brand.properties        |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh
index 4d3d297..e9b3738 100644
--- a/browser/branding/official/configure.sh
+++ b/browser/branding/official/configure.sh
@@ -1,2 +1,2 @@
-MOZ_APP_DISPLAYNAME=Firefox
+MOZ_APP_DISPLAYNAME=TorBrowser
 MOZ_UA_BUILDID=20100101
diff --git a/browser/branding/official/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd
index 142d79b..c137e04 100644
--- a/browser/branding/official/locales/en-US/brand.dtd
+++ b/browser/branding/official/locales/en-US/brand.dtd
@@ -1,4 +1,4 @@
-<!ENTITY  brandShortName        "Firefox">
-<!ENTITY  brandFullName         "Mozilla Firefox">
-<!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  brandShortName        "TorBrowser">
+<!ENTITY  brandFullName         "Tor Browser">
+<!ENTITY  vendorShortName       "Tor Project">
 <!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties
index 5f3ad54..62ac2fd 100644
--- a/browser/branding/official/locales/en-US/brand.properties
+++ b/browser/branding/official/locales/en-US/brand.properties
@@ -1,6 +1,6 @@
-brandShortName=Firefox
-brandFullName=Mozilla Firefox
-vendorShortName=Mozilla
+brandShortName=TorBrowser
+brandFullName=Tor Browser
+vendorShortName=Tor Project
 
 homePageSingleStartMain=Firefox Start, a fast home page with built-in search
 homePageImport=Import your home page from %S
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0015-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0015-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0015-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch?rev=1.1&content-type=text/plain

Index: 0015-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch
===================================================================
From c482a4bd10c58099f7bab0c5990c6e5a29b6c59d Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××××××.org>
Date: Thu, 7 Jun 2012 14:45:26 -0700
Subject: [PATCH 15/20] Make Tor Browser exit when not launched from Vidalia

Turns out the Windows 7 UI encourages users to "dock" their Tor Browser app
for easy relaunch. If they manage to do this, we should fail closed rather
than opened. Hopefully they will get the hint and dock Vidalia instead.

This is an emergency fix for
https://trac.torproject.org/projects/tor/ticket/4192. We can do a better
localized fix w/ a translated alert menu later, if it seems like this might
actually be common.
---
 browser/base/content/browser.js |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 6e254ca..57ca373 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1234,6 +1234,20 @@ function BrowserStartup() {
 
   prepareForStartup();
 
+  // If this is not a TBB profile, exit. 
+  // Solves https://trac.torproject.org/projects/tor/ticket/4192
+  var foundPref = false;
+  try {
+    foundPref = gPrefService.prefHasUserValue("torbrowser.version");
+  } catch(e) {
+    //dump("No pref: "+e);
+  }
+  if(!foundPref) {
+    var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"]
+                         .getService(Components.interfaces.nsIAppStartup);
+    appStartup.quit(3); // Force all windows to close, and then quit.
+  }
+
   if (uriToLoad && uriToLoad != "about:blank") {
     if (uriToLoad instanceof Ci.nsISupportsArray) {
       let count = uriToLoad.Count();
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch?rev=1.1&content-type=text/plain

Index: 0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch
===================================================================
From 7c321c4d75c7c80d899db962804d288ed7db162e Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××××××.org>
Date: Thu, 7 Jun 2012 15:26:13 -0700
Subject: [PATCH 18/20] Adapt Steven Michaud's Mac crashfix patch

Source is: https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35

Some minor tweaks were needed to get it to apply and to compile on
MacOS.
---
 widget/Makefile.in                        |    1 +
 widget/cocoa/nsChildView.mm               |   28 +++++++++++------
 widget/gtk2/nsDragService.cpp             |    2 +-
 widget/gtk2/nsWindow.cpp                  |    2 +-
 widget/nsIDragService.idl                 |    4 +--
 widget/nsPIDragService.idl                |   48 +++++++++++++++++++++++++++++
 widget/qt/nsDragService.h                 |    2 +
 widget/windows/Makefile.in                |    4 ++
 widget/windows/nsDragService.cpp          |   13 +++++---
 widget/windows/nsDragService.h            |   12 +++---
 widget/windows/nsNativeDragSource.cpp     |    7 ++--
 widget/windows/nsNativeDragTarget.cpp     |   28 ++++++++++------
 widget/windows/nsPIDragServiceWindows.idl |   46 +++++++++++++++++++++++++++
 widget/xpwidgets/nsBaseDragService.cpp    |   16 +++++++++-
 widget/xpwidgets/nsBaseDragService.h      |    9 ++---
 15 files changed, 176 insertions(+), 46 deletions(-)
 create mode 100644 widget/nsPIDragService.idl
 create mode 100644 widget/windows/nsPIDragServiceWindows.idl

diff --git a/widget/Makefile.in b/widget/Makefile.in
index 4a3405b..4c105a4 100644
--- a/widget/Makefile.in
+++ b/widget/Makefile.in
@@ -138,6 +138,7 @@ XPIDLSRCS	= \
 		nsIClipboardDragDropHooks.idl \
 		nsIClipboardDragDropHookList.idl \
 		nsIDragSession.idl \
+		nsPIDragService.idl \
 		nsIDragService.idl \
 		nsIFormatConverter.idl \
 		nsIClipboard.idl \
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 0db6b1c..8d59716 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -4555,11 +4555,12 @@ NSEvent* gLastDragMouseDownEvent = nil;
   if (!dragService) {
     dragService = do_GetService(kDragServiceContractID);
   }
+  nsCOMPtr<nsPIDragService> dragServicePriv = do_QueryInterface(dragService);
 
   if (dragService) {
     NSPoint pnt = [NSEvent mouseLocation];
     FlipCocoaScreenCoordinate(pnt);
-    dragService->DragMoved(NSToIntRound(pnt.x), NSToIntRound(pnt.y));
+    dragServicePriv->DragMoved(NSToIntRound(pnt.x), NSToIntRound(pnt.y));
   }
 }
 
@@ -4580,11 +4581,13 @@ NSEvent* gLastDragMouseDownEvent = nil;
   }
 
   if (mDragService) {
-    // set the dragend point from the current mouse location
-    nsDragService* dragService = static_cast<nsDragService *>(mDragService);
-    NSPoint pnt = [NSEvent mouseLocation];
-    FlipCocoaScreenCoordinate(pnt);
-    dragService->SetDragEndPoint(nsIntPoint(NSToIntRound(pnt.x), NSToIntRound(pnt.y)));
+    nsCOMPtr<nsPIDragService> dragServicePriv = do_QueryInterface(mDragService);
+    if (dragServicePriv) {
+      // set the dragend point from the current mouse location
+      NSPoint pnt = [NSEvent mouseLocation];
+      FlipCocoaScreenCoordinate(pnt);
+      dragServicePriv->SetDragEndPoint(NSToIntRound(pnt.x), NSToIntRound(pnt.y));
+    }
 
     // XXX: dropEffect should be updated per |operation|. 
     // As things stand though, |operation| isn't well handled within "our"
@@ -4595,10 +4598,15 @@ NSEvent* gLastDragMouseDownEvent = nil;
     // value for NSDragOperationGeneric that is passed by other applications.
     // All that said, NSDragOperationNone is still reliable.
     if (operation == NSDragOperationNone) {
-      nsCOMPtr<nsIDOMDataTransfer> dataTransfer;
-      dragService->GetDataTransfer(getter_AddRefs(dataTransfer));
-      if (dataTransfer)
-        dataTransfer->SetDropEffectInt(nsIDragService::DRAGDROP_ACTION_NONE);
+      nsCOMPtr<nsIDragSession> dragSession;
+      mDragService->GetCurrentSession(getter_AddRefs(dragSession));
+      if (dragSession) {
+        nsCOMPtr<nsIDOMDataTransfer> dataTransfer;
+        dragSession->GetDataTransfer(getter_AddRefs(dataTransfer));
+        if (dataTransfer) {
+            dataTransfer->SetDropEffectInt(nsIDragService::DRAGDROP_ACTION_NONE);
+        }
+      }
     }
 
     mDragService->EndDragSession(true);
diff --git a/widget/gtk2/nsDragService.cpp b/widget/gtk2/nsDragService.cpp
index be8f388..99d3878 100644
--- a/widget/gtk2/nsDragService.cpp
+++ b/widget/gtk2/nsDragService.cpp
@@ -1332,7 +1332,7 @@ nsDragService::SourceEndDragSession(GdkDragContext *aContext,
     GdkDisplay* display = gdk_display_get_default();
     if (display) {
       gdk_display_get_pointer(display, NULL, &x, &y, NULL);
-      SetDragEndPoint(nsIntPoint(x, y));
+      SetDragEndPoint(x, y);
     }
 
     // Either the drag was aborted or the drop occurred outside the app.
diff --git a/widget/gtk2/nsWindow.cpp b/widget/gtk2/nsWindow.cpp
index 9de734e..81fe553 100644
--- a/widget/gtk2/nsWindow.cpp
+++ b/widget/gtk2/nsWindow.cpp
@@ -3517,7 +3517,7 @@ nsWindow::OnDragDropEvent(GtkWidget *aWidget,
     if (display) {
       // get the current cursor position
       gdk_display_get_pointer(display, NULL, &x, &y, NULL);
-      ((nsDragService *)dragService.get())->SetDragEndPoint(nsIntPoint(x, y));
+      ((nsDragService *)dragService.get())->SetDragEndPoint(x, y);
     }
     dragService->EndDragSession(true);
 
diff --git a/widget/nsIDragService.idl b/widget/nsIDragService.idl
index e42c578..ef8c46f 100644
--- a/widget/nsIDragService.idl
+++ b/widget/nsIDragService.idl
@@ -48,7 +48,7 @@ interface nsIDOMDragEvent;
 interface nsIDOMDataTransfer;
 interface nsISelection;
 
-[scriptable, uuid(82B58ADA-F490-4C3D-B737-1057C4F1D052), builtinclass]
+[scriptable, uuid(82B58ADA-F490-4C3D-B737-1057C4F1D052)]
 interface nsIDragService : nsISupports
 {
   const long DRAGDROP_ACTION_NONE = 0;
@@ -145,8 +145,6 @@ interface nsIDragService : nsISupports
    */
   void suppress();
   void unsuppress();
-
-  [noscript] void dragMoved(in long aX, in long aY);
 };
 
 
diff --git a/widget/nsPIDragService.idl b/widget/nsPIDragService.idl
new file mode 100644
index 0000000..93a144d
--- /dev/null
+++ b/widget/nsPIDragService.idl
@@ -0,0 +1,48 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2012
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Steven Michaud <smichaud@×××××.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(FAD8C90B-8E1D-446A-9B6C-241486A85CBD)]
+interface nsPIDragService : nsISupports
+{
+  void dragMoved(in long aX, in long aY);
+
+  PRUint16 getInputSource();
+
+  void setDragEndPoint(in long aX, in long aY);
+};
diff --git a/widget/qt/nsDragService.h b/widget/qt/nsDragService.h
index 5a3e5bb..50dcfac 100644
--- a/widget/qt/nsDragService.h
+++ b/widget/qt/nsDragService.h
@@ -50,6 +50,8 @@ public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIDRAGSERVICE
 
+    NS_IMETHOD DragMoved(PRInt32 aX, PRInt32 aY);
+
     nsDragService();
 
 private:
diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in
index df811ac..8d5ea4b 100644
--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@@ -120,6 +120,10 @@ ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D10_LAYER
 endif
 
+XPIDLSRCS	+= \
+		nsPIDragServiceWindows.idl \
+		$(NULL)
+
 SHARED_LIBRARY_LIBS = \
   ../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
   $(NULL)
diff --git a/widget/windows/nsDragService.cpp b/widget/windows/nsDragService.cpp
index b6b5b62..9657263 100644
--- a/widget/windows/nsDragService.cpp
+++ b/widget/windows/nsDragService.cpp
@@ -97,6 +97,8 @@ nsDragService::~nsDragService()
   NS_IF_RELEASE(mDataObject);
 }
 
+NS_IMPL_ISUPPORTS_INHERITED1(nsDragService, nsBaseDragService, nsPIDragServiceWindows)
+
 bool
 nsDragService::CreateDragImage(nsIDOMNode *aDOMNode,
                                nsIScriptableRegion *aRegion,
@@ -347,7 +349,7 @@ nsDragService::StartInvokingDragSession(IDataObject * aDataObj,
   POINT cpos;
   cpos.x = GET_X_LPARAM(pos);
   cpos.y = GET_Y_LPARAM(pos);
-  SetDragEndPoint(nsIntPoint(cpos.x, cpos.y));
+  SetDragEndPoint(cpos.x, cpos.y);
   EndDragSession(true);
 
   mDoingDrag = false;
@@ -465,25 +467,26 @@ nsDragService::GetData(nsITransferable * aTransferable, PRUint32 anItem)
 
 //---------------------------------------------------------
 NS_IMETHODIMP
-nsDragService::SetIDataObject(IDataObject * aDataObj)
+nsDragService::SetIDataObject(nsISupports * aDataObj)
 {
+  IDataObject *dataObj = (IDataObject*) aDataObj;
   // When the native drag starts the DragService gets
   // the IDataObject that is being dragged
   NS_IF_RELEASE(mDataObject);
-  mDataObject = aDataObj;
+  mDataObject = dataObj;
   NS_IF_ADDREF(mDataObject);
 
   return NS_OK;
 }
 
 //---------------------------------------------------------
-void
+NS_IMETHODIMP
 nsDragService::SetDroppedLocal()
 {
   // Sent from the native drag handler, letting us know
   // a drop occurred within the application vs. outside of it.
   mSentLocalDropEvent = true;
-  return;
+  return NS_OK;
 }
 
 //-------------------------------------------------------------------------
diff --git a/widget/windows/nsDragService.h b/widget/windows/nsDragService.h
index 87d6cc9..04c8746 100644
--- a/widget/windows/nsDragService.h
+++ b/widget/windows/nsDragService.h
@@ -39,6 +39,7 @@
 #define nsDragService_h__
 
 #include "nsBaseDragService.h"
+#include "nsPIDragServiceWindows.h"
 #include <windows.h>
 #include <shlobj.h>
 
@@ -52,12 +53,15 @@ class  nsString;
  * Native Win32 DragService wrapper
  */
 
-class nsDragService : public nsBaseDragService
+class nsDragService : public nsBaseDragService, public nsPIDragServiceWindows
 {
 public:
   nsDragService();
   virtual ~nsDragService();
-  
+
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSPIDRAGSERVICEWINDOWS
+
   // nsIDragService
   NS_IMETHOD InvokeDragSession(nsIDOMNode *aDOMNode,
                                nsISupportsArray *anArrayTransferables,
@@ -71,13 +75,9 @@ public:
   NS_IMETHOD EndDragSession(bool aDoneDrag);
 
   // native impl.
-  NS_IMETHOD SetIDataObject(IDataObject * aDataObj);
   NS_IMETHOD StartInvokingDragSession(IDataObject * aDataObj,
                                       PRUint32 aActionType);
 
-  // A drop occurred within the application vs. outside of it.
-  void SetDroppedLocal();
-
 protected:
   nsDataObjCollection* GetDataObjCollection(IDataObject * aDataObj);
 
diff --git a/widget/windows/nsNativeDragSource.cpp b/widget/windows/nsNativeDragSource.cpp
index e51101e..0fe6ffe 100644
--- a/widget/windows/nsNativeDragSource.cpp
+++ b/widget/windows/nsNativeDragSource.cpp
@@ -42,7 +42,7 @@
 #include "nsIServiceManager.h"
 #include "nsToolkit.h"
 #include "nsWidgetsCID.h"
-#include "nsIDragService.h"
+#include "nsDragService.h"
 
 static NS_DEFINE_IID(kCDragServiceCID,  NS_DRAGSERVICE_CID);
 
@@ -101,9 +101,10 @@ STDMETHODIMP
 nsNativeDragSource::QueryContinueDrag(BOOL fEsc, DWORD grfKeyState)
 {
   nsCOMPtr<nsIDragService> dragService = do_GetService(kCDragServiceCID);
-  if (dragService) {
+  nsCOMPtr<nsPIDragService> dragServicePriv = do_QueryInterface(dragService);
+  if (dragServicePriv) {
     DWORD pos = ::GetMessagePos();
-    dragService->DragMoved(GET_X_LPARAM(pos), GET_Y_LPARAM(pos));
+    dragServicePriv->DragMoved(GET_X_LPARAM(pos), GET_Y_LPARAM(pos));
   }
 
   if (fEsc) {
diff --git a/widget/windows/nsNativeDragTarget.cpp b/widget/windows/nsNativeDragTarget.cpp
index 3362ca6..a69817c 100644
--- a/widget/windows/nsNativeDragTarget.cpp
+++ b/widget/windows/nsNativeDragTarget.cpp
@@ -205,7 +205,11 @@ nsNativeDragTarget::DispatchDragDropEvent(PRUint32 aEventType, POINTL aPT)
   event.isControl = IsKeyDown(NS_VK_CONTROL);
   event.isMeta    = false;
   event.isAlt     = IsKeyDown(NS_VK_ALT);
-  event.inputSource = static_cast<nsBaseDragService*>(mDragService)->GetInputSource();
+  event.inputSource = 0;
+  nsCOMPtr<nsPIDragService> dragServicePriv = do_QueryInterface(mDragService);
+  if (dragServicePriv) {
+    dragServicePriv->GetInputSource(&event.inputSource);
+  }
 
   mWindow->DispatchEvent(&event, status);
 }
@@ -292,9 +296,8 @@ nsNativeDragTarget::DragEnter(LPDATAOBJECT pIDataSource,
   // This cast is ok because in the constructor we created a
   // the actual implementation we wanted, so we know this is
   // a nsDragService. It should be a private interface, though.
-  nsDragService * winDragService =
-    static_cast<nsDragService *>(mDragService);
-  winDragService->SetIDataObject(pIDataSource);
+  nsCOMPtr<nsPIDragServiceWindows> winDragService = do_QueryInterface(mDragService);
+  winDragService->SetIDataObject((nsISupports*)pIDataSource);
 
   // Now process the native drag state and then dispatch the event
   ProcessDrag(NS_DRAGDROP_ENTER, grfKeyState, ptl, pdwEffect);
@@ -432,8 +435,8 @@ nsNativeDragTarget::Drop(LPDATAOBJECT pData,
   // This cast is ok because in the constructor we created a
   // the actual implementation we wanted, so we know this is
   // a nsDragService (but it should still be a private interface)
-  nsDragService* winDragService = static_cast<nsDragService*>(mDragService);
-  winDragService->SetIDataObject(pData);
+  nsCOMPtr<nsPIDragServiceWindows> winDragService = do_QueryInterface(mDragService);
+  winDragService->SetIDataObject((nsISupports*)pData);
 
   // NOTE: ProcessDrag spins the event loop which may destroy arbitrary objects.
   // We use strong refs to prevent it from destroying these:
@@ -457,11 +460,14 @@ nsNativeDragTarget::Drop(LPDATAOBJECT pData,
   // tell the drag service we're done with the session
   // Use GetMessagePos to get the position of the mouse at the last message
   // seen by the event loop. (Bug 489729)
-  DWORD pos = ::GetMessagePos();
-  POINT cpos;
-  cpos.x = GET_X_LPARAM(pos);
-  cpos.y = GET_Y_LPARAM(pos);
-  winDragService->SetDragEndPoint(nsIntPoint(cpos.x, cpos.y));
+  nsCOMPtr<nsPIDragService> dragServicePriv = do_QueryInterface(mDragService);
+  if (dragServicePriv) {
+    DWORD pos = ::GetMessagePos();
+    POINT cpos;
+    cpos.x = GET_X_LPARAM(pos);
+    cpos.y = GET_Y_LPARAM(pos);
+    dragServicePriv->SetDragEndPoint(cpos.x, cpos.y);
+  }
   serv->EndDragSession(true);
 
   // release the ref that was taken in DragEnter
diff --git a/widget/windows/nsPIDragServiceWindows.idl b/widget/windows/nsPIDragServiceWindows.idl
new file mode 100644
index 0000000..c8a46dd
--- /dev/null
+++ b/widget/windows/nsPIDragServiceWindows.idl
@@ -0,0 +1,46 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2012
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Steven Michaud <smichaud@×××××.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(6FC2117D-5EB4-441A-9C12-62A783BEBC0C)]
+interface nsPIDragServiceWindows : nsISupports
+{
+  void setIDataObject(in nsISupports aDataObj);
+
+  void setDroppedLocal();
+};
diff --git a/widget/xpwidgets/nsBaseDragService.cpp b/widget/xpwidgets/nsBaseDragService.cpp
index 342a036..87e28f7 100644
--- a/widget/xpwidgets/nsBaseDragService.cpp
+++ b/widget/xpwidgets/nsBaseDragService.cpp
@@ -88,7 +88,7 @@ nsBaseDragService::~nsBaseDragService()
 {
 }
 
-NS_IMPL_ISUPPORTS2(nsBaseDragService, nsIDragService, nsIDragSession)
+NS_IMPL_ISUPPORTS3(nsBaseDragService, nsIDragService, nsPIDragService, nsIDragSession)
 
 //---------------------------------------------------------
 NS_IMETHODIMP
@@ -436,6 +436,20 @@ nsBaseDragService::DragMoved(PRInt32 aX, PRInt32 aY)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsBaseDragService::SetDragEndPoint(PRInt32 aX, PRInt32 aY)
+{
+  mEndDragPoint = nsIntPoint(aX, aY);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBaseDragService::GetInputSource(PRUint16* aInputSource)
+{
+  *aInputSource = mInputSource;
+  return NS_OK;
+}
+
 static nsIPresShell*
 GetPresShellForContent(nsIDOMNode* aDOMNode)
 {
diff --git a/widget/xpwidgets/nsBaseDragService.h b/widget/xpwidgets/nsBaseDragService.h
index 290c0cb..2ceac2b 100644
--- a/widget/xpwidgets/nsBaseDragService.h
+++ b/widget/xpwidgets/nsBaseDragService.h
@@ -39,6 +39,7 @@
 #define nsBaseDragService_h__
 
 #include "nsIDragService.h"
+#include "nsPIDragService.h"
 #include "nsIDragSession.h"
 #include "nsITransferable.h"
 #include "nsISupportsArray.h"
@@ -64,6 +65,7 @@ class nsICanvasElementExternal;
  */
 
 class nsBaseDragService : public nsIDragService,
+                          public nsPIDragService,
                           public nsIDragSession
 {
 
@@ -74,14 +76,11 @@ public:
   //nsISupports
   NS_DECL_ISUPPORTS
 
-  //nsIDragSession and nsIDragService
+  //nsIDragSession, nsIDragService and nsPIDragService
   NS_DECL_NSIDRAGSERVICE
+  NS_DECL_NSPIDRAGSERVICE
   NS_DECL_NSIDRAGSESSION
 
-  void SetDragEndPoint(nsIntPoint aEndDragPoint) { mEndDragPoint = aEndDragPoint; }
-
-  PRUint16 GetInputSource() { return mInputSource; }
-
 protected:
 
   /**
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0007-Disable-SSL-Session-ID-tracking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0007-Disable-SSL-Session-ID-tracking.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0007-Disable-SSL-Session-ID-tracking.patch?rev=1.1&content-type=text/plain

Index: 0007-Disable-SSL-Session-ID-tracking.patch
===================================================================
From 3eebe3b7e2882de39e2c686a38e7084cccfa4c60 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××.org>
Date: Wed, 7 Dec 2011 19:36:38 -0800
Subject: [PATCH 07/20] Disable SSL Session ID tracking.

We can't easily bind SSL Session ID tracking to url bar domain,
so we have to disable them to satisfy
https://www.torproject.org/projects/torbrowser/design/#identifier-linkability.
---
 security/nss/lib/ssl/sslsock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c
index 28e6210..fa48ecd 100644
--- a/security/nss/lib/ssl/sslsock.c
+++ b/security/nss/lib/ssl/sslsock.c
@@ -173,7 +173,7 @@ static sslOptions ssl_defaults = {
     PR_FALSE,	/* enableSSL2         */ /* now defaults to off in NSS 3.13 */
     PR_TRUE,	/* enableSSL3         */
     PR_TRUE, 	/* enableTLS          */ /* now defaults to on in NSS 3.0 */
-    PR_FALSE,	/* noCache            */
+    PR_TRUE,	/* noCache            */
     PR_FALSE,	/* fdx                */
     PR_FALSE,	/* v2CompatibleHello  */ /* now defaults to off in NSS 3.13 */
     PR_TRUE,	/* detectRollBack     */
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0008-Provide-an-observer-event-to-close-persistent-connec.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0008-Provide-an-observer-event-to-close-persistent-connec.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0008-Provide-an-observer-event-to-close-persistent-connec.patch?rev=1.1&content-type=text/plain

Index: 0008-Provide-an-observer-event-to-close-persistent-connec.patch
===================================================================
From 9594d3f2df4f20308406deea30aaccd577587438 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××××××.org>
Date: Wed, 1 Feb 2012 15:53:28 -0800
Subject: [PATCH 08/20] Provide an observer event to close persistent
 connections

We need to prevent linkability across "New Identity", which includes closing
keep-alive connections.
---
 netwerk/protocol/http/nsHttpHandler.cpp |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index dcdf729..672d436 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -338,6 +338,7 @@ nsHttpHandler::Init()
         mObserverService->AddObserver(this, "net:clear-active-logins", true);
         mObserverService->AddObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC, true);
         mObserverService->AddObserver(this, "net:prune-dead-connections", true);
+        mObserverService->AddObserver(this, "net:prune-all-connections", PR_TRUE);
     }
  
     return NS_OK;
@@ -1587,6 +1588,12 @@ nsHttpHandler::Observe(nsISupports *subject,
             mConnMgr->PruneDeadConnections();
         }
     }
+    else if (strcmp(topic, "net:prune-all-connections") == 0) {
+        if (mConnMgr) {
+           mConnMgr->ClosePersistentConnections();
+           mConnMgr->PruneDeadConnections();
+        }
+    }
   
     return NS_OK;
 }
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0019-Fix-Firefox-13-build-process.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0019-Fix-Firefox-13-build-process.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0019-Fix-Firefox-13-build-process.patch?rev=1.1&content-type=text/plain

Index: 0019-Fix-Firefox-13-build-process.patch
===================================================================
From 41f44964edbee300c098d110be3f029ebb711081 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××××××.org>
Date: Fri, 8 Jun 2012 12:42:25 -0700
Subject: [PATCH 19/20] Fix Firefox 13 build process.

Patch is from https://bugzilla.mozilla.org/show_bug.cgi?id=736961.
---
 config/rules.mk                 |    4 ++--
 js/src/config/rules.mk          |    4 ++--
 js/xpconnect/src/Makefile.in    |   10 +++++-----
 xpcom/idl-parser/Makefile.in    |    2 +-
 xpcom/typelib/xpidl/Makefile.in |    4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index e6353e1..c65c1f3 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_DIR)/.done
 	$(PYTHON_PATH) \
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
-	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
 	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
 	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
 
@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_DIR)/.done
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
 
 # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
 ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index e6353e1..c65c1f3 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_DIR)/.done
 	$(PYTHON_PATH) \
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
-	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
 	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
 	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
 
@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_DIR)/.done
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
 
 # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
 ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
index 7dc7812..a369bcd 100644
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  $(srcdir)/qsgen.py \
 	  --idlpath=$(DEPTH)/dist/idl \
-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
 	  --header-output dom_quickstubs.h \
 	  --stub-output dom_quickstubs.cpp \
 	  --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  $(srcdir)/dombindingsgen.py \
 	  --idlpath=$(DEPTH)/dist/idl \
-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
 	  --header-output dombindings_gen.h \
 	  $(srcdir)/dombindings.conf
 
@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  $(srcdir)/dombindingsgen.py \
 	  --idlpath=$(DEPTH)/dist/idl \
-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
 	  --stub-output dombindings_gen.cpp \
 	  --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \
 	  $(srcdir)/dombindings.conf
@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.conf \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  $(srcdir)/dictionary_helper_gen.py \
 	  -I $(DEPTH)/dist/idl \
-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
 	  --header-output DictionaryHelpers.h \
 	  $(srcdir)/dictionary_helper_gen.conf
 
@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen.conf \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  $(srcdir)/dictionary_helper_gen.py \
 	  -I $(DEPTH)/dist/idl \
-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
 	  --header-output DictionaryHelpers.h \
 	  --stub-output DictionaryHelpers.cpp \
 	  --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \
diff --git a/xpcom/idl-parser/Makefile.in b/xpcom/idl-parser/Makefile.in
index f5ff178..97390c5 100644
--- a/xpcom/idl-parser/Makefile.in
+++ b/xpcom/idl-parser/Makefile.in
@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS)
 	$(PYTHON_PATH) \
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
-	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
+	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen
 
 check::
 	$(PYTHON_PATH) \
diff --git a/xpcom/typelib/xpidl/Makefile.in b/xpcom/typelib/xpidl/Makefile.in
index bcae13a..4edda5d 100644
--- a/xpcom/typelib/xpidl/Makefile.in
+++ b/xpcom/typelib/xpidl/Makefile.in
@@ -48,8 +48,8 @@ SDK_BINARY = \
   $(topsrcdir)/xpcom/idl-parser/xpidl.py \
   $(topsrcdir)/xpcom/idl-parser/header.py \
   $(topsrcdir)/xpcom/idl-parser/typelib.py \
-  $(DEPTH)/xpcom/idl-parser/xpidllex.py \
-  $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \
+  $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \
+  $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \
   $(NULL)
 
 ifndef MOZ_SYSTEM_PLY
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0012-Add-DDG-and-StartPage-to-Omnibox.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0012-Add-DDG-and-StartPage-to-Omnibox.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0012-Add-DDG-and-StartPage-to-Omnibox.patch?rev=1.1&content-type=text/plain

Index: 0012-Add-DDG-and-StartPage-to-Omnibox.patch
===================================================================
From 59b8b663b93248db34ad741ccb9972ecb6814c1f Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××××××.org>
Date: Wed, 25 Apr 2012 15:03:46 -0700
Subject: [PATCH 12/20] Add DDG and StartPage to Omnibox.

You mean there are search engines that don't require captchas if you don't
have a cookie? Holy crap. Get those in there now.
---
 browser/locales/en-US/searchplugins/duckduckgo.xml |   29 ++++++++++++++++++++
 browser/locales/en-US/searchplugins/list.txt       |    2 +
 browser/locales/en-US/searchplugins/startpage.xml  |   11 +++++++
 3 files changed, 42 insertions(+), 0 deletions(-)
 create mode 100644 browser/locales/en-US/searchplugins/duckduckgo.xml
 create mode 100644 browser/locales/en-US/searchplugins/startpage.xml

diff --git a/browser/locales/en-US/searchplugins/duckduckgo.xml b/browser/locales/en-US/searchplugins/duckduckgo.xml
new file mode 100644
index 0000000..4f00b4d
--- /dev/null
+++ b/browser/locales/en-US/searchplugins/duckduckgo.xml
@@ -0,0 +1,29 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>DuckDuckGo</ShortName>
+<Description>Duck Duck Go</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8n
+IOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rB
+Uv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n/////
+/05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v//
+//////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9h
+XPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg
+7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs
+5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/
+JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8n IOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg
+7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1
+/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/
+fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y
+1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg
+7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDs
+AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA
+AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD
+AADwDwAA+B8AAA==</Image>
+<Url type="text/html" method="POST" template="https://duckduckgo.com/html/">
+  <Param name="q" value="{searchTerms}"/>
+</Url>
+<SearchForm>https://duckduckgo.com/html/</SearchForm>
+</SearchPlugin>
diff --git a/browser/locales/en-US/searchplugins/list.txt b/browser/locales/en-US/searchplugins/list.txt
index 2a1141a..0466f4e 100644
--- a/browser/locales/en-US/searchplugins/list.txt
+++ b/browser/locales/en-US/searchplugins/list.txt
@@ -1,7 +1,9 @@
 amazondotcom
 bing
+duckduckgo
 eBay
 google
+startpage
 twitter
 wikipedia
 yahoo
diff --git a/browser/locales/en-US/searchplugins/startpage.xml b/browser/locales/en-US/searchplugins/startpage.xml
new file mode 100644
index 0000000..1a310b1
--- /dev/null
+++ b/browser/locales/en-US/searchplugins/startpage.xml
@@ -0,0 +1,11 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>Startpage</ShortName>
+<Description>Start Page</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2jkj+9YtD/vWLQ/71i0P+9otD/vaLRP72i0T+9YtE/vWLRP72i0T+9otD/vaNRP72jUT+9otF/vaLRf73kkv+9Yc///WJP//1iT//9Yk///rAmf/94Mz/+sCa//aRTv/1iUH/9ok///aJP//2i0H/9otB//aJQv/2iUL/9otC//aNRP/2jUT/9o1E//aNRP/6wpv////////////96dr/95dQ//aNRP/2kET/9pBG//aQRv/2kEb/9pBG//aRR//3lEz/95BH//mueP/7xJ3/959g//efYf/4p23//vDm//3p2//3kEr/95FJ//aRSf/niFH/95FK//aRSv/2mE//95hS/vq4iP/////////////////81bj/95xZ//q4iP//////+bF+//eZT//njFT/PSqi/2xGjv/2mVD/951V/vedVv783cX///////vQrf/++PP///////748//+8uj///////m3gf/olFr/PSuj/w8Pt/9sSJD/951V//eeWf73oVv++8ul///////5sXf/+KRi//vRsf////////////3r3v/olF//Piyk/w8Pt/9sSJH/+J5Z//ieWv/3oV/++KZf/vihXP/97N7//vn0//zTs//6wJP/+bBy//q6iP/onW//Piyl/w8Pt/8fGbH/m2iB/+icY//4pGD/96hl/viqZf74pmD/+Kxr//3iy/////////n1//ivbP/onGj/Pi2m/w8Pt/8uJKz/fFeQ/x8Zsf8+Lqb/6J9r//ivbP74rm3++Klm//mpZv/5q2f/+bR9//m0e//poW7/Pi6n/w8Pt/9sTZj/+Ktp//ira/+rd4P/Dw+3/4xijv/5snH++
 LN1/vmvbf/5r23/+a5t//mvb//4r2//TTuk/w8Pt/8fGrL/6ah1//ivcP/4r3P/q3yI/w8Pt/+MZpP/+bN5/vm4ev75t3X/+bV1//m1df/5t3X/+Ld3/8qUhP98XZn/Hxqz/+mse//5t3f/2p+B/x8as/8PD7f/u4qK//m7fv76u4D++bl7//m3fP/5uXz/+bl8//m5fP/5t3z/+bl//x8as/9NPKf/fWCb/x8as/8PD7f/bVOh//q5f//6v4X++sGI/vm9g//5voX/+b6F//m9hf/6vYX/+r6F//nCh/+bepr/Hxu0/w8Pt/8PD7f/fWOh//q+hf/6wof/+saN/vrGjf75xIv/+ceL//nEi//5xIv/+sSL//rHi//6x43/+ceN/+m7kP+7lpj/6ruQ//rHkP/6x43/+seQ//rLlf76ypT++seR//rJkf/6yZH/+seR//rJkf/6yZH/+8mR//vJlP/7yZT/+smU//rJlP/6yZT/+8yV//rJlf/6zpn+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</Image>
+
+<Url type="text/html" method="POST" template="https://startpage.com/do/search">
+  <Param name="q" value="{searchTerms}"/>
+</Url>
+<SearchForm>https://startpage.com/do/search/</SearchForm>
+</SearchPlugin>
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0016-Limit-the-number-of-fonts-per-document.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0016-Limit-the-number-of-fonts-per-document.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0016-Limit-the-number-of-fonts-per-document.patch?rev=1.1&content-type=text/plain

Index: 0016-Limit-the-number-of-fonts-per-document.patch
===================================================================
From 649b237e95315e9858cfb038f9f7f95199584cbd Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××××××.org>
Date: Thu, 7 Jun 2012 15:09:59 -0700
Subject: [PATCH 16/20] Limit the number of fonts per document.

We create two prefs:
browser.display.max_font_count and browser.display.max_font_attempts.
max_font_count sets a limit on the number of fonts actually used in the
document, and max_font_attempts sets a limit on the total number of CSS
queries that a document is allowed to perform.

Once either limit is reached, the browser behaves as if
browser.display.use_document_fonts was set to 0 for subsequent font queries.

If a pref is not set or is negative, that limit does not apply.

This is done to address:
https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linkability
---
 layout/base/nsPresContext.cpp |  100 +++++++++++++++++++++++++++++++++++++++++
 layout/base/nsPresContext.h   |    9 ++++
 layout/style/nsRuleNode.cpp   |   13 ++++-
 3 files changed, 119 insertions(+), 3 deletions(-)

diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index f3815fb..1ab210e 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -97,6 +97,8 @@
 #include "FrameLayerBuilder.h"
 #include "nsDOMMediaQueryList.h"
 #include "nsSMILAnimationController.h"
+#include "nsString.h"
+#include "nsUnicharUtils.h"
 
 #ifdef IBMBIDI
 #include "nsBidiPresUtils.h"
@@ -772,6 +774,10 @@ nsPresContext::GetUserPreferences()
   // * use fonts?
   mUseDocumentFonts =
     Preferences::GetInt("browser.display.use_document_fonts") != 0;
+  mMaxFonts =
+    Preferences::GetInt("browser.display.max_font_count", -1);
+  mMaxFontAttempts =
+    Preferences::GetInt("browser.display.max_font_attempts", -1);
 
   // * replace backslashes with Yen signs? (bug 245770)
   mEnableJapaneseTransform =
@@ -1381,6 +1387,100 @@ nsPresContext::GetDefaultFont(PRUint8 aFontID, nsIAtom *aLanguage) const
   return font;
 }
 
+PRBool
+nsPresContext::FontUseCountReached(const nsFont &font) {
+  if (mMaxFonts < 0) {
+    return PR_FALSE;
+  }
+
+  for (PRUint32 i = 0; i < mFontsUsed.Length(); i++) {
+    if (mFontsUsed[i].name.Equals(font.name,
+                                  nsCaseInsensitiveStringComparator())
+        // XXX: Style is sometimes filled with garbage??
+        /*&& mFontsUsed[i].style == font.style*/) {
+      // seen it before: OK
+      return PR_FALSE;
+    }
+  }
+
+  if (mFontsUsed.Length() >= mMaxFonts) {
+    return PR_TRUE;
+  }
+
+  return PR_FALSE;
+}
+
+PRBool
+nsPresContext::FontAttemptCountReached(const nsFont &font) {
+  if (mMaxFontAttempts < 0) {
+    return PR_FALSE;
+  }
+
+  for (PRUint32 i = 0; i < mFontsTried.Length(); i++) {
+    if (mFontsTried[i].name.Equals(font.name,
+                                  nsCaseInsensitiveStringComparator())
+        // XXX: Style is sometimes filled with garbage??
+        /*&& mFontsTried[i].style == font.style*/) {
+      // seen it before: OK
+      return PR_FALSE;
+    }
+  }
+
+  if (mFontsTried.Length() >= mMaxFontAttempts) {
+    return PR_TRUE;
+  }
+
+  return PR_FALSE;
+}
+
+void
+nsPresContext::AddFontUse(const nsFont &font) {
+  if (mMaxFonts < 0) {
+    return;
+  }
+
+  for (PRUint32 i = 0; i < mFontsUsed.Length(); i++) {
+    if (mFontsUsed[i].name.Equals(font.name,
+                                  nsCaseInsensitiveStringComparator())
+        // XXX: Style is sometimes filled with garbage??
+        /*&& mFontsUsed[i].style == font.style*/) {
+      // seen it before: OK
+      return;
+    }
+  }
+
+  if (mFontsUsed.Length() >= mMaxFonts) {
+    return;
+  }
+   
+  mFontsUsed.AppendElement(font);
+  return;
+}
+
+void
+nsPresContext::AddFontAttempt(const nsFont &font) {
+  if (mMaxFontAttempts < 0) {
+    return;
+  }
+
+  for (PRUint32 i = 0; i < mFontsTried.Length(); i++) {
+    if (mFontsTried[i].name.Equals(font.name,
+                                  nsCaseInsensitiveStringComparator())
+        // XXX: Style is sometimes filled with garbage??
+        /*&& mFontsTried[i].style == font.style*/) {
+      // seen it before: OK
+      return;
+    }
+  }
+
+  if (mFontsTried.Length() >= mMaxFontAttempts) {
+    return;
+  }
+   
+  mFontsTried.AppendElement(font);
+  return;
+}
+
 void
 nsPresContext::SetFullZoom(float aZoom)
 {
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index e367c5f..3d979f1 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -535,6 +535,13 @@ public:
     }
   }
 
+  nsTArray<nsFont> mFontsUsed; // currently for font-count limiting only
+  nsTArray<nsFont> mFontsTried; // currently for font-count limiting only
+  void AddFontUse(const nsFont &font);
+  void AddFontAttempt(const nsFont &font);
+  PRBool FontUseCountReached(const nsFont &font);
+  PRBool FontAttemptCountReached(const nsFont &font);
+
   /**
    * Get the minimum font size for the specified language. If aLanguage
    * is nsnull, then the document's language is used.
@@ -1188,6 +1195,8 @@ protected:
   PRUint32              mInterruptChecksToSkip;
 
   mozilla::TimeStamp    mReflowStartTime;
+  PRInt32               mMaxFontAttempts;
+  PRInt32               mMaxFonts;
 
   unsigned              mHasPendingInterrupt : 1;
   unsigned              mInterruptsEnabled : 1;
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 4b134b2..82b1dd7 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -3102,14 +3102,15 @@ nsRuleNode::ComputeFontData(void* aStartStruct,
 
   bool useDocumentFonts =
     mPresContext->GetCachedBoolPref(kPresContext_UseDocumentFonts);
+  bool isXUL = PR_FALSE;
 
   // See if we are in the chrome
   // We only need to know this to determine if we have to use the
   // document fonts (overriding the useDocumentFonts flag).
-  if (!useDocumentFonts && mPresContext->IsChrome()) {
+  if (mPresContext->IsChrome()) {
     // if we are not using document fonts, but this is a XUL document,
     // then we use the document fonts anyway
-    useDocumentFonts = true;
+    isXUL = true;
   }
 
   // Figure out if we are a generic font
@@ -3123,9 +3124,13 @@ nsRuleNode::ComputeFontData(void* aStartStruct,
     // generic?
     nsFont::GetGenericID(font->mFont.name, &generic);
 
+    mPresContext->AddFontAttempt(font->mFont);
+
     // If we aren't allowed to use document fonts, then we are only entitled
     // to use the user's default variable-width font and fixed-width font
-    if (!useDocumentFonts) {
+    if (!isXUL && (!useDocumentFonts ||
+                    mPresContext->FontAttemptCountReached(font->mFont) ||
+                    mPresContext->FontUseCountReached(font->mFont))) {
       // Extract the generic from the specified font family...
       nsAutoString genericName;
       if (!font->mFont.EnumerateFamilies(ExtractGeneric, &genericName)) {
@@ -3161,6 +3166,8 @@ nsRuleNode::ComputeFontData(void* aStartStruct,
                                font);
   }
 
+  if (font->mGenericID == kGenericFont_NONE)
+    mPresContext->AddFontUse(font->mFont);
   COMPUTE_END_INHERITED(Font, font)
 }
 
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0014-Prevent-WebSocket-DNS-leak.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0014-Prevent-WebSocket-DNS-leak.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0014-Prevent-WebSocket-DNS-leak.patch?rev=1.1&content-type=text/plain

Index: 0014-Prevent-WebSocket-DNS-leak.patch
===================================================================
From 0607517f87c2a0060f4f1e437f0ac37a889047a9 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××××××.org>
Date: Wed, 2 May 2012 17:44:39 -0700
Subject: [PATCH 14/20] Prevent WebSocket DNS leak.

This is due to an improper implementation of the WebSocket spec by Mozilla.

"There MUST be no more than one connection in a CONNECTING state.  If multiple
connections to the same IP address are attempted simultaneously, the client
MUST serialize them so that there is no more than one connection at a time
running through the following steps.

If the client cannot determine the IP address of the remote host (for
example, because all communication is being done through a proxy server that
performs DNS queries itself), then the client MUST assume for the purposes of
this step that each host name refers to a distinct remote host,"

https://tools.ietf.org/html/rfc6455#page-15

They implmented the first paragraph, but not the second...

While we're at it, we also prevent the DNS service from being used to look up
anything other than IP addresses if socks_remote_dns is set to true, so this
bug can't turn up in other components or due to 3rd party addons.
---
 netwerk/dns/nsDNSService2.cpp                   |   24 ++++++++++++++++++++++-
 netwerk/dns/nsDNSService2.h                     |    1 +
 netwerk/protocol/websocket/WebSocketChannel.cpp |    8 +++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/netwerk/dns/nsDNSService2.cpp b/netwerk/dns/nsDNSService2.cpp
index 7458729..40fbaba 100644
--- a/netwerk/dns/nsDNSService2.cpp
+++ b/netwerk/dns/nsDNSService2.cpp
@@ -403,6 +403,7 @@ nsDNSService::Init()
     bool     enableIDN        = true;
     bool     disableIPv6      = false;
     bool     disablePrefetch  = false;
+    bool     disableDNS       = false;
     int      proxyType        = nsIProtocolProxyService::PROXYCONFIG_DIRECT;
     
     nsAdoptingCString ipv4OnlyDomains;
@@ -426,6 +427,10 @@ nsDNSService::Init()
 
         // If a manual proxy is in use, disable prefetch implicitly
         prefs->GetIntPref("network.proxy.type", &proxyType);
+
+        // If the user wants remote DNS, we should fail any lookups that still
+        // make it here.
+        prefs->GetBoolPref("network.proxy.socks_remote_dns", &disableDNS);
     }
 
     if (mFirstTime) {
@@ -443,7 +448,7 @@ nsDNSService::Init()
 
             // Monitor these to see if there is a change in proxy configuration
             // If a manual proxy is in use, disable prefetch implicitly
-            prefs->AddObserver("network.proxy.type", this, false);
+            prefs->AddObserver("network.proxy.", this, false);
         }
     }
 
@@ -472,6 +477,7 @@ nsDNSService::Init()
         mIDN = idn;
         mIPv4OnlyDomains = ipv4OnlyDomains; // exchanges buffer ownership
         mDisableIPv6 = disableIPv6;
+        mDisableDNS = disableDNS;
 
         // Disable prefetching either by explicit preference or if a manual proxy is configured 
         mDisablePrefetch = disablePrefetch || (proxyType == nsIProtocolProxyService::PROXYCONFIG_MANUAL);
@@ -583,6 +589,14 @@ nsDNSService::AsyncResolve(const nsACString  &hostname,
         if (mDisablePrefetch && (flags & RESOLVE_SPECULATE))
             return NS_ERROR_DNS_LOOKUP_QUEUE_FULL;
 
+        PRNetAddr tempAddr;
+        if (mDisableDNS) {
+            // Allow IP lookups through, but nothing else.
+            if (PR_StringToNetAddr(hostname.BeginReading(), &tempAddr) != PR_SUCCESS) {
+                return NS_ERROR_UNKNOWN_PROXY_HOST; // XXX: NS_ERROR_NOT_IMPLEMENTED?
+            }
+        }
+
         res = mResolver;
         idn = mIDN;
     }
@@ -669,6 +683,14 @@ nsDNSService::Resolve(const nsACString &hostname,
         MutexAutoLock lock(mLock);
         res = mResolver;
         idn = mIDN;
+
+        PRNetAddr tempAddr;
+        if (mDisableDNS) {
+            // Allow IP lookups through, but nothing else.
+            if (PR_StringToNetAddr(hostname.BeginReading(), &tempAddr) != PR_SUCCESS) {
+                return NS_ERROR_UNKNOWN_PROXY_HOST; // XXX: NS_ERROR_NOT_IMPLEMENTED?
+            }
+        }
     }
     NS_ENSURE_TRUE(res, NS_ERROR_OFFLINE);
 
diff --git a/netwerk/dns/nsDNSService2.h b/netwerk/dns/nsDNSService2.h
index 1749b41..3ec8eba 100644
--- a/netwerk/dns/nsDNSService2.h
+++ b/netwerk/dns/nsDNSService2.h
@@ -70,4 +70,5 @@ private:
     bool                      mDisableIPv6;
     bool                      mDisablePrefetch;
     bool                      mFirstTime;
+    bool                      mDisableDNS;
 };
diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp
index 3578866..b1aaec2 100644
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -1884,8 +1884,12 @@ WebSocketChannel::ApplyForAdmission()
   LOG(("WebSocketChannel::ApplyForAdmission: checking for concurrent open\n"));
   nsCOMPtr<nsIThread> mainThread;
   NS_GetMainThread(getter_AddRefs(mainThread));
-  dns->AsyncResolve(hostName, 0, this, mainThread, getter_AddRefs(mDNSRequest));
-  NS_ENSURE_SUCCESS(rv, rv);
+  rv = dns->AsyncResolve(hostName, 0, this, mainThread, getter_AddRefs(mDNSRequest));
+  if (NS_FAILED(rv)) {
+      // Fall back to hostname on dispatch failure
+      mDNSRequest = nsnull;
+      OnLookupComplete(nsnull, nsnull, rv);
+  }
 
   return NS_OK;
 }
-- 
1.7.5.4




1.1                  www-client/torbrowser/files/torbrowser-patches/0013-Make-nsICacheService.EvictEntries-synchronous.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0013-Make-nsICacheService.EvictEntries-synchronous.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/torbrowser/files/torbrowser-patches/0013-Make-nsICacheService.EvictEntries-synchronous.patch?rev=1.1&content-type=text/plain

Index: 0013-Make-nsICacheService.EvictEntries-synchronous.patch
===================================================================
From 3b6137594c9f25725b3dd0fd46cfc8c86d6a772e Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@××××××××××.org>
Date: Tue, 1 May 2012 15:02:03 -0700
Subject: [PATCH 13/20] Make nsICacheService.EvictEntries synchronous

This fixes a race condition that allows cache-based EverCookies to persist for
a brief time (on the order of minutes?) after cache clearing/"New Identity".

https://trac.torproject.org/projects/tor/ticket/5715
---
 netwerk/cache/nsCacheService.cpp |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp
index 8c85b68..d43f121 100644
--- a/netwerk/cache/nsCacheService.cpp
+++ b/netwerk/cache/nsCacheService.cpp
@@ -1414,10 +1414,21 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor)
     return NS_OK;
 }
 
-
 NS_IMETHODIMP nsCacheService::EvictEntries(nsCacheStoragePolicy storagePolicy)
 {
-    return  EvictEntriesForClient(nsnull, storagePolicy);
+    NS_IMETHODIMP r;
+    r = EvictEntriesForClient(nsnull, storagePolicy);
+
+    // XXX: Bloody hack until we get this notifier in FF14.0:
+    // https://developer.mozilla.org/en/XPCOM_Interface_Reference/nsICacheListener#onCacheEntryDoomed%28%29
+    if (storagePolicy == nsICache::STORE_ANYWHERE &&
+            NS_IsMainThread() && gService && gService->mInitialized) {
+        nsCacheServiceAutoLock lock;
+        gService->DoomActiveEntries();
+        gService->ClearDoomList();
+        (void) SyncWithCacheIOThread();
+    }
+    return r; 
 }
 
 NS_IMETHODIMP nsCacheService::GetCacheIOTarget(nsIEventTarget * *aCacheIOTarget)
-- 
1.7.5.4