Please review and merge feature/whisperback_1.6.1.
Sorry, no ticket. Below are the two commits in that branch:
commit a0e6bf09e0dd46d9727aa1b02ee70aca9d5f464a
Author: Tails developers <amnesia@???>
Date: Tue Oct 2 22:34:21 2012 +0200
Drop longer-whisperback-timeout.patch
This is included upstream in whisperback 1.6.1
commit a3d9b5ac6ddcba33dbe44da159c605ec2732c540
Author: Tails developers <amnesia@???>
Date: Tue Oct 2 22:35:40 2012 +0200
Upgrade bundled WhisperBack package to 1.6.1
The ChangeLog reads:
1.6.1
=====
Minor improvements
------------------
* Raise the socket library timeout to 120 seconds
* Use smtplib's timeout parameter
Bugfixes
--------
* Fix error output when calling send a 2nd time
--
