From 142f75e8f302f99d34ed1b4e2ac51fed9e6892cc Mon Sep 17 00:00:00 2001
From: pointbiz <d>
Date: Sun, 22 Nov 2015 14:54:07 -0400
Subject: [PATCH] v3.1.0 add BIP38 encryption to Wallet Details tab

---
 CHANGELOG.txt           |  4 ++++
 CHANGELOG.txt.asc       | 18 +++++++++++-------
 bitaddress.org.html     |  1 -
 bitaddress.org.html.sig | 14 +++++++-------
 package.json            |  4 ++--
 src/ninja.unittests.js  |  1 -
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 70862600..161b173b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -28,6 +28,10 @@ END USER NOTES:
 
 Here is a signed list of file names and version history.
 
+2015-11-22: status ACTIVE
+bitaddress.org-v3.1.0-SHA256-c3d4d8da8fc6980435a520dff562b7f831b2f6037ec2d4dd6bf76c5321873303.html
+ - add BIP38 encryption on Wallet Details tab.
+
 2015-10-25: status ACTIVE
 bitaddress.org-v3.0.1-SHA256-24d2d7f047a9aa217bf69f3ef344c972c151b1e3f6a8aa86ceb9a3be62884bc0.html
  - fix for session log not keeping track of keys from "Wallet Details" tab before entropy is collected.
diff --git a/CHANGELOG.txt.asc b/CHANGELOG.txt.asc
index 574f7d5f..77b6b106 100644
--- a/CHANGELOG.txt.asc
+++ b/CHANGELOG.txt.asc
@@ -31,6 +31,10 @@ END USER NOTES:
 
 Here is a signed list of file names and version history.
 
+2015-11-22: status ACTIVE
+bitaddress.org-v3.1.0-SHA256-c3d4d8da8fc6980435a520dff562b7f831b2f6037ec2d4dd6bf76c5321873303.html
+ - add BIP38 encryption on Wallet Details tab.
+
 2015-10-25: status ACTIVE
 bitaddress.org-v3.0.1-SHA256-24d2d7f047a9aa217bf69f3ef344c972c151b1e3f6a8aa86ceb9a3be62884bc0.html
  - fix for session log not keeping track of keys from "Wallet Details" tab before entropy is collected.
@@ -306,11 +310,11 @@ bitaddress.org-v0.1-SHA1-f40e706490f3eb2be56c31ddbf4c8646cd51ef40.html
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.13 (MingW32)
 
-iQEcBAEBAgAGBQJWLWE7AAoJEIdJe5Fjl09aNdIH/AuVLeRqLu7eQOlZPRU6v1E+
-BNi+bgamlZSyo+IjvCz49QjzB/Yaa0zMtjwfWdlhTaA9UMiw0a0CD2lEMwFumDHw
-oDk2mWgUGnSQEQvMT731z9kLVJRg681JUeLluaWSv4B7IAddGXtV2HlgzvX46WnX
-ipKkPZcUy+QH596oyYeAfL3PX42KDm9MC3Bz3jS0N32nLvbvzDI+4f1PtVUqLJC3
-NjxZ4pbYpxb6/2pSJRGnDL8IxL8pCfCmxwN1rBi5V1+AngsiQc+NWnXfOxm0NLJN
-QZzb8f5FNrbKlQQHkQgcutQK0SlNGrPVc3NZPaLobFUmFpluu/7UNI2bi1Orbxg=
-=Y2pw
+iQEcBAEBAgAGBQJWUg6qAAoJEIdJe5Fjl09afp8IAJvmclA316w8GOsOOoAd6+JO
+dyJLa7PJ3xxELm3om3MLP3Am9em08ZQYNhccKVo2ZXOBcqoduSFsLVHfoNZ1/lQu
+s6ISCPx/9P0slIdy4lJtj7S4bqLxWb8t10MgSOpPH8qag/XLDZxjETo3/LG1V5IL
+sULWxFk+JS/rAt9A1yjAwO2Fk5NUEuWINCPfj8YUg2osKxgJFg7Qa1GdndVv9sRW
+IF/IjZ/JTdLh3nqCtw6xfNe4Bzzv+0JLp+S4lB4ZJieaLoRPsPb72cwJq4JGyfrP
+TGI9L1fkXNJEAbjIXxQP8WD19DNIQmq0EOc2j47O2zUhSvQtrxacZFZ12Z186V4=
+=BewV
 -----END PGP SIGNATURE-----
diff --git a/bitaddress.org.html b/bitaddress.org.html
index ba358960..af4b8b6c 100644
--- a/bitaddress.org.html
+++ b/bitaddress.org.html
@@ -11462,7 +11462,6 @@
 				];
 
 				ninja.runSerialized(testArray, done);
-				//TODO: ninja.runSerialized([		testArray[0],testArray[1]		], done);
 			}
 		}
 	};
diff --git a/bitaddress.org.html.sig b/bitaddress.org.html.sig
index 43fcba77..4544f4f4 100644
--- a/bitaddress.org.html.sig
+++ b/bitaddress.org.html.sig
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.13 (MingW32)
 
-iQEcBAABAgAGBQJWLWFMAAoJEIdJe5Fjl09arGsIAME5oLCA0YOKC+37MlSGTTbD
-wGuYkYa6nXCxynAyG1E/obKoHBgxmvKEJDP7+5Q+KRIUCaj2M1YgrwYfpDtAYvxR
-hma7BUXJgHQSStOdLTlLNiGOFhn1m0hFHBIV7vxt+eVd//ty0JRZWhdoMFTxjqPf
-OqdvMe6bmo2wJiVog2QoYd19TgUfEWhGEes8uWBrz0RCMKa3J9tKR+iyP+xcBQGV
-ZAxh404PXccFKJa7YKBuuytENwTpyUEOVHJo/gGhLoBl52TPRV7BfgV5/5PtTjlI
-Jdvl3O/gibkknoC8mSyrHqjuFs+92v13JuKzXzWBj4iEYlRAPWGVlAbVuGonYZM=
-=A9BF
+iQEcBAABAgAGBQJWUg7BAAoJEIdJe5Fjl09aZZUH/0MKwbNX8fhAyfhFeaTAKRwM
+mEtRrrvGY9v/OoeKnRas1LsfL/zuT0u1YtwnjFY8VX1ML3uu814TX0pnC5N2LyPC
+5WGjoE7+COYNC6dghVJa9NP9U2tqwYSykheNvnJIML75DMnfX1W4XLxF+8rtQ+fc
+Pdgkfvkv2RMvFxa5KFU7agNewI/p0/ngoh9gxfjYfItiiqmg5o2ZxiFpotFwVR8+
+xNeD5ZFLzU2NB/vta71e6wEO1Se7NOYYh8XF/9kKxurSuGD0p95OXpiRhtZ79nGs
+Qlknkdl+PsLlrcXaarnQggWI6/5QIeqAcyj5jmAim+eyV6V/cERsutxHx+IbM1s=
+=isNw
 -----END PGP SIGNATURE-----
diff --git a/package.json b/package.json
index fd4c3740..f42bd610 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "bitaddress.org",
   "version": "3.1.0",
-  "sha1sum": "",
-  "sha256sum": "",
+  "sha1sum": "cd0806b7a95e31e27a9e88c516876f21d841a461",
+  "sha256sum": "c3d4d8da8fc6980435a520dff562b7f831b2f6037ec2d4dd6bf76c5321873303",
   "description": "Open Source JavaScript Client-Side Bitcoin Wallet Generator",
   "main": "Gruntfile.js",
   "dependencies": {
diff --git a/src/ninja.unittests.js b/src/ninja.unittests.js
index 5785a180..377db45c 100644
--- a/src/ninja.unittests.js
+++ b/src/ninja.unittests.js
@@ -767,7 +767,6 @@
 				];
 
 				ninja.runSerialized(testArray, done);
-				//TODO: ninja.runSerialized([		testArray[0],testArray[1]		], done);
 			}
 		}
 	};