Re: Merge issues in `tls.el' (EMACS_22_BASE vs. trunk)