diff -r 159651b3c9ec -r d8f92c3a17d6 mercurial/mail.py
--- a/mercurial/mail.py	Fri Jan 07 20:50:41 2011 +0100
+++ b/mercurial/mail.py	Fri Jan 07 20:50:42 2011 +0100
@@ -33,7 +33,7 @@
 def _smtp(ui):
     '''build an smtp connection and return a function to send mail'''
     local_hostname = ui.config('smtp', 'local_hostname')
-    tls = ui.config('smtp', 'tls')
+    tls = ui.config('smtp', 'tls', 'none')
     # backward compatible: when tls = true, we use starttls.
     starttls = tls == 'starttls' or util.parsebool(tls)
     smtps = tls == 'smtps'