[Pkg-privacy-commits] [obfs4proxy] 06/11: Merge branch 'getlantern-memreduce'

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository obfs4proxy.

commit a9e8a62f9b914d872f0b83528c60f22bada0fcd1
Merge: 6205762 64e5920
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Thu Oct 20 01:36:53 2016 +0000

    Merge branch 'getlantern-memreduce'

 ChangeLog                  | 2 ++
 transports/obfs4/obfs4.go  | 5 +++--
 transports/obfs4/packet.go | 5 ++---
 3 files changed, 7 insertions(+), 5 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfs4proxy.git