Merge branch 'master' into outbound

diff --cc config.go
Simple merge

diff --cc pop3.go
Simple merge

diff --cc smtp.go
index fe0c4b5f47356075986b47d877887b26a209b578,14ead8fc41fd5652ca0fbf5fd614f48812d2fe86..2a27279b636aacc068139be322790ffda3410128
--- 1/smtp.go
--- 2/smtp.go
+++ b/smtp.go
@@@ -7,8 -13,9 +13,8 @@@ import 
        "net/mail"
        "os"
        "path"
 -      "strings"
  
-       "github.com/uber-go/zap"
+       "go.uber.org/zap"
  
        "src.bluestatic.org/mailpopbox/smtp"
  )

diff --cc smtp/conn.go
index eb868e4fd17ddf315b04af9b151e489bed423f5b,94db8a8d785ac6c19dca759940e59d8b583bc393..ec1644e327888edc0d0c605ff8fd8ce69866b7f6
--- 1/smtp/conn.go
--- 2/smtp/conn.go
+++ b/smtp/conn.go
@@@ -56,12 -40,8 +62,12 @@@ type connection struct 
        esmtp bool
        tls   *tls.ConnectionState
  
-       log zap.Logger
- 
+       log *zap.Logger
+ 
 +      // The authcid from a PLAIN SASL login. Non-empty iff tls is non-nil and
 +      // doAUTH() succeeded.
 +      authc string
 +
        state
        line string
  

diff --cc smtp/conn_test.go
Simple merge

diff --cc smtp/server.go
Simple merge