Merge branch 'RemoveURLRedirect'

* RemoveURLRedirect:
  CHANGELOG: Document this branch
  post_process.redirect: Log exceptions as warnings
  post_process.redirect: Add support for enclosures
  post_process.redirect: Specify user-agent
  post_process.redirect: Add hook to remove redirections
  config: Fix 'massage' -> 'message' typo

Signed-off-by: W. Trevor King <wking@tremily.us>

diff --combined CHANGELOG
index 44c26143ca59b80b91458c031ce01b7c1186c610,59e3d2541fdfc47e9c426da669f4e64df6f06b54..f3917733bdffa3402025f4772e0067788fff6123
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,19 -1,7 +1,22 @@@
 -v3.7 (unreleased)
+ v3.10 (unreleased)
+     * Add a redirect post-process module.
+ 
 +v3.9 (2014-09-01)
 +    * Catch and error out if a user adds a feed with a duplicate name.
 +    * Split sender into both sendmail's -F and -f.
 +    * Fix an error with SMTPConnectionError inheritance order ("does not take keyword arguments").
 +    * Add a new `smtp-ssl-protocol` setting, to select acceptable protocols for SMTP connections.
 +    * Fix non-compliant User-Agent header for HTTP/1.1.
 +    * Fix an error in the NoToEmailAddress invocation.
 +    * Add a new `trust-link` setting, to prefer the `link` attribute over the `id` attribute for identifying entries.
 +
 +v3.8 (2014-01-18)
 +    * Sluggify feed names on opmlimport.
 +    * Allow Unicode letters and digits in feed names, instead of just ASCII lettters and digits.
 +
 +v3.7 (2013-10-11)
 +    * Fix fallback for titles that contain malformed HTML.
 +    * Fix atomic saves to avoid garbling config and data files if the disk is full.
      * Convert the `friendly-name` boolean to the new `name-format` setting.  This allow users to customize how the friendly name is constructed.
      * Demote guessed encodings logs from 'error' to 'warning'.
  

diff --combined rss2email/config.py
index ebea5a2bb4aa45d12d96b906d2f2d365c9453cca,7c0ca3dd55a01a9e965fd49ca266c4e08e192e0b..d21d7a54a233d4e9eee2b352481087d6ef34c70b
--- 1/rss2email/config.py
--- 2/rss2email/config.py
+++ b/rss2email/config.py
@@@ -1,16 -1,14 +1,16 @@@
 -# Copyright (C) 2004-2013 Aaron Swartz
 +# Copyright (C) 2004-2014 Aaron Swartz
  #                         Brian Lalor
  #                         Dean Jackson
  #                         Dmitry Bogatov <KAction@gnu.org>
  #                         Erik Hetzner
  #                         Etienne Millon <me@emillon.org>
 +#                         George Saunders <georgesaunders@gmail.com>
  #                         Joey Hess
  #                         Lindsey Smith <lindsey.smith@gmail.com>
  #                         Marcel Ackermann
  #                         Martin 'Joey' Schulze
  #                         Matej Cepl
 +#                         Thiago Coutinho <root@thiagoc.net>
  #                         W. Trevor King <wking@tremily.us>
  #
  # This file is part of rss2email.
@@@ -109,12 -107,6 +109,12 @@@ CONFIG['DEFAULT'] = _collections.Ordere
          # True: Receive one email per post.
          # False: Receive an email every time a post changes.
          ('trust-guid', str(True)),
 +        # True: Receive one email per unique link url.
 +        # False: Defer to trust-guid preference.
 +        # Toggling this for existing feeds may result in duplicates,
 +        # because the old entries will not be recorded under their new
 +        # link-based ids.
 +        ('trust-link', str(False)),
          # To most correctly encode emails with international
          # characters, we iterate through the list below and use the
          # first character set that works.
@@@ -123,7 -115,7 +123,7 @@@
          # Example: post-process = 'rss2email.post_process.downcase downcase_message'
          ('post-process', ''),
          # User processing hooks for digest messages.  If 'digest' is
-         # enabled, the usual 'post-process' hook gets to massage the
+         # enabled, the usual 'post-process' hook gets to message the
          # per-entry messages, but this hook is called with the full
          # digest message before it is mailed.
          # Example: digest-post-process = 'rss2email.post_process.downcase downcase_message'
@@@ -193,7 -185,6 +193,7 @@@
          ('smtp-password', 'password'),  # password for SMTP AUTH
          ('smtp-server', 'smtp.yourisp.net:25'),
          ('smtp-ssl', str(False)),       # Connect to the SMTP server using SSL
 +        ('smtp-ssl-protocol', 'SSLv3'), # TLS/SSL version to use on STARTTLS when not using 'smtp-ssl'
          # IMAP configuration
          ('imap-auth', str(False)),      # set to True to use IMAP auth.
          ('imap-username', 'username'),  # username for IMAP authentication