doc/Makefile.am | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 prefix asciidoc command with tz=utc env variable

https://wiki.debian.org/ReproducibleBuilds/TimestampsInDocumentationGeneratedByAsciidoc

doc/shadowsocks-libev.asciidoc | 3 3 + 0 - 0 !
doc/ss-local.asciidoc | 6 5 + 1 - 0 !
doc/ss-redir.asciidoc | 5 4 + 1 - 0 !
doc/ss-server.asciidoc | 7 5 + 2 - 0 !
doc/ss-tunnel.asciidoc | 5 4 + 1 - 0 !
src/utils.c | 2 2 + 0 - 0 !
6 files changed, 23 insertions(+), 5 deletions(-)

 update docs for tcp_nodelay

(cherry picked from commit b721c0fa6d1c8e6a8528c7808fd6c6f806c66578)

src/local.c | 2 1 + 1 - 0 !
src/redir.c | 2 1 + 1 - 0 !
src/server.c | 2 1 + 1 - 0 !
src/tunnel.c | 2 1 + 1 - 0 !
4 files changed, 4 insertions(+), 4 deletions(-)

 properly set recv_ctx->connected

(cherry picked from commit 82694c8f19a9cc39f4a7647c9e8764e5cc5a39bd)

scripts/build_deb.sh | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 fix scripts/build_deb.sh for debian jessie

Thanks to Tom <hexuxin@foxmail.com> for the bug report.

(cherry picked from commit da85fa17d4b6526e4ffceb6da0465734a252963f)

configure.ac | 5 1 + 4 - 0 !
doc/Makefile.am | 24 10 + 14 - 0 !
2 files changed, 11 insertions(+), 18 deletions(-)

 fix #1693

(cherry picked from commit 10a2d3e3cd76b148d5f5996f06267cc40e62cac5)

src/manager.c | 31 19 + 12 - 0 !
1 file changed, 19 insertions(+), 12 deletions(-)

 fix #1734

Fix potential local exploit issue.
Thanks to X41 D-Sec GmbH, Niklas Abel, for the reporting:
 https://www.x41-dsec.de/lab/advisories/x41-2017-010-shadowsocks-libev/

(cherry picked from commit c67d275803dc6ea22c558d06b1f7ba9f94cd8de3)

src/jconf.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix #1739

(cherry picked from commit b3f3b58a1d33da73f42420e1d4ec904beb5a9761)

src/jconf.c | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 refine #1739

(cherry picked from commit f19a96e1fad1820ad10efba265f1ce772b9d1d53)