Merge branch 'master' of bombadil.infradead.org:public_git/eximconf

diff --cc conf/verify-except-senders
index da64928f2b5917d72fc020794f155ae63edb1428,ed0f86e72cf04848609c2e739de4a1f4ecbb28c7..8cb4f2e31a82b5706fd23e54a25500a3f73134ae
--- 1/conf/verify-except-senders
--- 2/conf/verify-except-senders
+++ b/conf/verify-except-senders
@@@ -1,4 -1,6 +1,7 @@@
 +mail.smartnd.ca: *
+ hsbcib.com: 24hours
+ humblebundle.com: *
+ mozilla.com: no-reply
  supersonic.web.va.us.xda-developers.com: www
  466817-web2.eservicesgroup.net: apache
  bugs.documentfoundation.org: bugzilla-daemon