# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1468245253 18000
# Node ID be68a44450416581227c43216f07ad8a71e550bc
# Parent  4b16a5bd99484cac96ade9af76e6deee1fc57b54# Parent  a7d1532b26a17bbaace43124cd415dcb709b08e2
merge with stable

diff -r 4b16a5bd9948 -r be68a4445041 mercurial/sslutil.py
--- a/mercurial/sslutil.py	Wed Jul 06 21:16:00 2016 -0700
+++ b/mercurial/sslutil.py	Mon Jul 11 08:54:13 2016 -0500
@@ -384,7 +384,7 @@
                 if _dnsnamematch(value, hostname):
                     return
             except wildcarderror as e:
-                return e.message
+                return e.args[0]
 
             dnsnames.append(value)
 
@@ -405,7 +405,7 @@
                         if _dnsnamematch(value, hostname):
                             return
                     except wildcarderror as e:
-                        return e.message
+                        return e.args[0]
 
                     dnsnames.append(value)