Merge branch 'qq/maint'

diff --git a/git-send-email.perl b/git-send-email.perl
index a047b016e34c995152a05318dd322f49cb23f57e..3564419e81694d84f4ebf036fe0df70277a81a98 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -772,6 +772,7 @@ sub send_message
                                if ($smtp->code == 220) {
                                        $smtp = Net::SMTP::SSL->start_SSL($smtp)
                                                or die "STARTTLS failed! ".$smtp->message;
+                                       $smtp_encryption = '';
                                } else {
                                        die "Server does not support STARTTLS! ".$smtp->message;
                                }