Import upstream CVS Fri, 12 Sep 2014 22:57:45 +0200

Signed-off-by: Frank Terbeck <ft@bewatermyfriend.org>
Remove 04-upstream-tls1-option.patch

In preparation of upstream merge.

Signed-off-by: Frank Terbeck <ft@bewatermyfriend.org>
Merge branch 'upstream'
Bump Standards-Version
Update debian/changelog

Signed-off-by: Frank Terbeck <ft@bewatermyfriend.org>