Merge branch '1.0' into 1.1

# Conflicts:
#	lib/browser/neo4j-web.min.js
#	lib/browser/neo4j-web.test.js
#	src/v1/internal/ch-node.js
#	test/v1/tck/steps/tlssteps.js

Author: oskarhane

src/v1/internal/ch-node.js

@@ -117,7 +117,7 @@ const TrustStrategy = {
     }
 
     let tlsOpts = {
-      ca: opts.trustedCertificates.map(fs.readFileSync),
+      ca: opts.trustedCertificates.map((f) => fs.readFileSync(f)),
       // Because we manually check for this in the connect callback, to give
       // a more helpful error to the user
       rejectUnauthorized: false
@@ -131,7 +131,7 @@ const TrustStrategy = {
           " is a security measure to protect against man-in-the-middle attacks. If you are just trying " +
           " Neo4j out and are not concerned about encryption, simply disable it using `encrypted=\"" + ENCRYPTION_OFF +
           "\"` in the driver" +
-          " options."));
+          " options. Socket responded with: " + socket.authorizationError));
       } else {
         onSuccess();
       }

test/internal/tls.test.js

@@ -66,6 +66,24 @@ describe('trust-signed-certificates', function() {
     driver.session().run( "RETURN 1").then( done );
   });
 
+  it('should handle multiple certificates', function(done) {
+    // Assuming we only run this test on NodeJS with TOFU support
+    if( !NodeChannel.available ) {
+      done();
+      return;
+    }
+
+    // Given
+    driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {
+      encrypted: true,
+      trust: "TRUST_SIGNED_CERTIFICATES",
+      trustedCertificates: ["build/neo4j/certificates/neo4j.cert", "test/resources/random.certificate"]
+    });
+
+    // When
+    driver.session().run( "RETURN 1").then( done );
+  });
+
   afterEach(function(){
     if( driver ) {
       driver.close();