commit fd0e6b2e702c59a92acc862d742b77470afecd06 Merge: 9ae4b65 d857177 Author: Yawning Angel yawning@schwanenlied.me Date: Mon Oct 30 07:51:02 2017 +0000

Merge branch 'bug23943'

ChangeLog | 1 + data/tor-obfs4-amd64.seccomp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc ChangeLog index 412c05c,05d1cea..6d9071f --- a/ChangeLog +++ b/ChangeLog @@@ -1,7 -1,6 +1,8 @@@ Changes in version 0.0.15 - UNRELEASED: * Bug 23915: 7.0.7 and later fails to work without `SECCOMP_FILTER_FLAG_TSYNC`. + * Bug 23166: Add Felix's obfs4 bridges to the built-in bridges. + * Bug 23943: obfs4proxy crashes on certain systems. + * Disable the 2017 donation campaign banner.

Changes in version 0.0.14 - 2017-09-29: * Bug 8706: Fully disable the .recently-used.xbel.