Update watch file
Imported Upstream version 3.4
Merge tag 'upstream/3.4' into experimental

Upstream version 3.4

* tag 'upstream/3.4':
  Imported Upstream version 3.4

Conflicts:
	.gitignore
bump version header in changelog
Close bugs with new version
Suggest esmtp
Add X-Python3-Version
Canonicalize Vcs-Git field
Bump S-V
Imported Upstream version 3.5
Merge tag 'upstream/3.5' into experimental

Upstream version 3.5

* tag 'upstream/3.5':
  Imported Upstream version 3.5
Update changelog