From e564ed8d4cfeceb2caf769302a3c34d4b11c7485 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Sat, 21 Oct 2017 15:40:57 -0700
Subject: [PATCH 1/3] Version 3.11.2

---
 CHANGELOG.md      | 5 +++++
 app/manifest.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbbc2e3be..f0b0c0498 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Current Master
 
+## 3.11.2 2017-10-21
+
+- Fix bug where reject button would sometimes not work.
+- Fixed bug where sometimes MetaMask's connection to a page would be unreliable.
+
 ## 3.11.1 2017-10-20
 
 - Fix bug where log filters were not populated correctly
diff --git a/app/manifest.json b/app/manifest.json
index c30d90dfa..eb499390a 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "3.11.1",
+  "version": "3.11.2",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",

From 926abc12b13c1529af188d156cc45f14d7e80bc5 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Sun, 22 Oct 2017 22:12:12 -0700
Subject: [PATCH 2/3] Add support for alternative ENS TLDs

Fixes #2428
---
 CHANGELOG.md                   | 2 ++
 ui/app/components/ens-input.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0b0c0498..6a3e75634 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- Add support for alternative ENS TLDs (Ethereum Name Service Top-Level Domains).
+
 ## 3.11.2 2017-10-21
 
 - Fix bug where reject button would sometimes not work.
diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js
index 3a33ebf74..c85a23514 100644
--- a/ui/app/components/ens-input.js
+++ b/ui/app/components/ens-input.js
@@ -6,7 +6,7 @@ const debounce = require('debounce')
 const copyToClipboard = require('copy-to-clipboard')
 const ENS = require('ethjs-ens')
 const networkMap = require('ethjs-ens/lib/network-map.json')
-const ensRE = /.+\.eth$/
+const ensRE = /.+\..+$/
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
 
 

From 6d052384691b6336df0a60b47f3283ee2bb06ada Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Sun, 22 Oct 2017 22:24:50 -0700
Subject: [PATCH 3/3] Try to fix intermittent test failure in NonceTracker
 tests

---
 app/scripts/controllers/network.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 0f9db4d53..7f0cbd379 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -51,6 +51,10 @@ module.exports = class NetworkController extends EventEmitter {
   }
 
   lookupNetwork () {
+    // Prevent firing when provider is not defined.
+    if (!this.ethQuery || !this.ethQuery.sendAsync) {
+      return
+    }
     this.ethQuery.sendAsync({ method: 'net_version' }, (err, network) => {
       if (err) return this.setNetworkState('loading')
       log.info('web3.getNetwork returned ' + network)