Merge branch 'master' into eyeballs

CHANGELOG.md

@@ -6,6 +6,10 @@
 - Replaced identicons with jazzicons
 - Fixed glitchy transitions
 
+## 1.8.4 2016-05-13
+
+- Point rpc servers to https endpoints.
+
 ## 1.8.3 2016-05-12
 
 - Bumped web3 to 0.6.0

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "Metamask",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "manifest_version": 2,
   "description": "__MSG_appDescription__",
   "icons": {

app/scripts/lib/config-manager.js

@@ -2,8 +2,8 @@ const Migrator = require('pojo-migrator')
 const extend = require('xtend')
 
 const STORAGE_KEY = 'metamask-config'
-const TESTNET_RPC = 'http://morden.infura.io'
-const MAINNET_RPC = 'http://mainnet.infura.io/'
+const TESTNET_RPC = 'https://morden.infura.io'
+const MAINNET_RPC = 'https://mainnet.infura.io/'
 
 const migrations = require('./migrations')