Code

merge code#9

Code

Open

NilFoss wants to merge 98 commits intoNilFoss:masterNilFoss/shadowsocks:masterfrom shadowsocks:mastershadowsocks/shadowsocks:masterCopy head branch name to clipboard

+3,122-667

Commits

Commits on Aug 8, 2015

• Update README.md

  clowwindy

  committed
  c5dd081

  Copy full SHA for c5dd081

Commits on Aug 9, 2015

• fix json unicode issue in manager

  clowwindy

  committed
  3c11549

  Copy full SHA for 3c11549

Commits on Aug 10, 2015

• fix json decode issue

  clowwindy

  committed
  a434eef

  Copy full SHA for a434eef

• update CHANGES

  clowwindy

  committed
  7c08101

  Copy full SHA for 7c08101

Commits on Aug 11, 2015

• fix #414

  clowwindy

  committed
  a2bc6e1

  Copy full SHA for a2bc6e1

Commits on Aug 15, 2015

• fix #425

  clowwindy

  committed
  f19d0ea

  Copy full SHA for f19d0ea

Commits on Aug 16, 2015

• Update README.md

  clowwindy

  committed
  eb033a8

  Copy full SHA for eb033a8

Commits on Aug 17, 2015

• allow user to override system dnsserver with config.

  Show description for 0c4f792
  

  李林哲

  committed
  0c4f792

  Copy full SHA for 0c4f792

• dns_server config test

  

  李林哲

  committed
  ffed9b2

  Copy full SHA for ffed9b2

• Merge pull request #335 from slayercat/master

  Show description for e52aa9d
  clowwindy

  committed
  e52aa9d

  Copy full SHA for e52aa9d

• Update README.md

  clowwindy

  committed
  61a0b2d

  Copy full SHA for 61a0b2d

Commits on Aug 20, 2015

• Update README.md

  clowwindy

  committed
  5b450ac

  Copy full SHA for 5b450ac

Commits on Oct 9, 2015

• fix manger bug

  mengskysama

  committed
  6683dfd

  Copy full SHA for 6683dfd

Commits on Oct 26, 2015

• fix bug!

  Show description for 4d24b74
  mengskysama

  committed
  4d24b74

  Copy full SHA for 4d24b74

• fix memory leak!

  Show description for 0aba0aa
  mengskysama

  committed
  0aba0aa

  Copy full SHA for 0aba0aa

• readme

  mengskysama

  committed
  34851fb

  Copy full SHA for 34851fb

Commits on Nov 13, 2015

• Update common.py

  Show description for 173323c
  mengskysama

  committed
  173323c

  Copy full SHA for 173323c

Commits on Dec 5, 2015

• one time auth server side

  mengskysama

  committed
  767b921

  Copy full SHA for 767b921

Commits on Jan 11, 2016

• ota completed!

  mengskysama

  committed
  77b2a22

  Copy full SHA for 77b2a22

• fix udp ota

  mengskysama

  committed
  ca99abf

  Copy full SHA for ca99abf

• Merge pull request #481 from RockerFlower/master

  Show description for 743ddf4
  mengskysama

  committed
  743ddf4

  Copy full SHA for 743ddf4

• Merge branch 'feature-ota'

  mengskysama

  committed
  28c4d14

  Copy full SHA for 28c4d14

• reverse config

  mengskysama

  committed
  569ca0d

  Copy full SHA for 569ca0d

• README.md

  mengskysama

  committed
  7efc3e2

  Copy full SHA for 7efc3e2

• ota config

  mengskysama

  committed
  2d40a36

  Copy full SHA for 2d40a36

• udp ota bug

  mengskysama

  committed
  ee391c7

  Copy full SHA for ee391c7

• PEP8

  mengskysama

  committed
  a4a87eb

  Copy full SHA for a4a87eb

• PEP8

  mengskysama

  committed
  7c8ecb8

  Copy full SHA for 7c8ecb8

• PEP8

  mengskysama

  committed
  614eed2

  Copy full SHA for 614eed2

• here?

  mengskysama

  committed
  285dc40

  Copy full SHA for 285dc40

• Can't append to data files in parallel mode.

  mengskysama

  committed
  ab42062

  Copy full SHA for ab42062

• Can't append to data files in parallel mode.

  mengskysama

  committed
  4786b9c

  Copy full SHA for 4786b9c

• Can't append to data files in parallel mode.

  mengskysama

  committed
  3788df5

  Copy full SHA for 3788df5

• url ssl timeout

  mengskysama

  committed
  9f3641d

  Copy full SHA for 9f3641d

• fixbug: when ota disable data not write

  mengskysama

  committed
  d2f1cae

  Copy full SHA for d2f1cae

• Merge remote-tracking branch 'origin/fixbug-ci'

  mengskysama

  committed
  ae082f2

  Copy full SHA for ae082f2

• 9001 not idle?

  mengskysama

  committed
  efad757

  Copy full SHA for efad757

• CI Try again!

  mengskysama

  committed
  288c11c

  Copy full SHA for 288c11c

• Merge branch 'master' into fixbug-ci

  mengskysama

  committed
  bcf9329

  Copy full SHA for bcf9329

Commits on Jan 12, 2016

• remove IPv6 testcase and add ota test

  mengskysama

  committed
  248582c

  Copy full SHA for 248582c

• test pass ota in udp

  mengskysama

  committed
  269e3dd

  Copy full SHA for 269e3dd

• add CI

  mengskysama

  committed
  f163a7b

  Copy full SHA for f163a7b

• PEP8 and undefined name 'gen_key_iv'

  mengskysama

  committed
  811a0e6

  Copy full SHA for 811a0e6

• fix bug with ord in Py3

  mengskysama

  committed
  a8d116d

  Copy full SHA for a8d116d

• README CI

  mengskysama

  committed
  efe39a7

  Copy full SHA for efe39a7

• Merge branch 'fixbug-ci'

  mengskysama

  committed
  e1e17c8

  Copy full SHA for e1e17c8

• Update README.md

  mengskysama

  committed
  b9766ce

  Copy full SHA for b9766ce

Commits on Feb 20, 2016

• Add support for option 'prefer-ipv6'

  htc550605125

  committed
  b276d52

  Copy full SHA for b276d52

Commits on Feb 24, 2016

• add dockerfile

  htc550605125

  committed
  9d6b9fc

  Copy full SHA for 9d6b9fc

Commits on Mar 14, 2016

• Merge pull request #507 from htc550605125/master

  Show description for 5b58069
  mengskysama

  committed
  5b58069

  Copy full SHA for 5b58069

Commits on Apr 16, 2016

• Update install.sh

  Show description for 1f24b31
  mengskysama

  committed
  1f24b31

  Copy full SHA for 1f24b31

• fix build dante cache and old src corrupt and slow

  mengskysama

  committed
  bb53b0c

  Copy full SHA for bb53b0c

• Add auth method check for TCP socks connections (#528)

  Show description for aae990a
  

  watermeter

  authored and

  mengskysama

  committed
  aae990a

  Copy full SHA for aae990a

• pep8

  mengskysama

  committed
  f62a550

  Copy full SHA for f62a550

• pep8

  mengskysama

  committed
  9844ba9

  Copy full SHA for 9844ba9

Commits on May 14, 2016

• fix ota

  v3aqb

  committed
  677e6c4

  Copy full SHA for 677e6c4

Commits on Jun 2, 2016

• Merge pull request #543 from v3aqb/fix_ota

  Show description for 34fa8de
  madeye

  committed
  34fa8de

  Copy full SHA for 34fa8de

Commits on Jul 18, 2016

• add ota help in local

  mengskysama

  authored
  f7afcd4

  Copy full SHA for f7afcd4

• Update tcprelay.py

  Show description for 8e8ee5d
  mengskysama

  authored
  8e8ee5d

  Copy full SHA for 8e8ee5d

Commits on Aug 17, 2016

• Add chacha20-ietf crypto (#590)

  Show description for 6ef14e5
  

  smounives

  authored and

  mengskysama

  committed
  6ef14e5

  Copy full SHA for 6ef14e5

Commits on Aug 23, 2016

• Dockfile add libsodium (#601)

  

  ficapy

  authored and

  mengskysama

  committed
  f35590b

  Copy full SHA for f35590b

Commits on Sep 4, 2016

• fix ota (#609)(#610) (#610)

  

  v3aqb

  authored and

  mengskysama

  committed
  56bf81f

  Copy full SHA for 56bf81f

• fix ota call write_to_sock multi

  mengskysama

  committed
  5c11527

  Copy full SHA for 5c11527

Commits on Oct 7, 2016

• Refactor (#615)

  Show description for 5cd9f04
  

  ahxxm

  authored and

  mengskysama

  committed
  5cd9f04

  Copy full SHA for 5cd9f04

Commits on Oct 10, 2016

• Fix a OTA bug on _ota_chunk_data (#642)

  Show description for 4f28f7c
  

  loggerhead

  authored and

  mengskysama

  committed
  4f28f7c

  Copy full SHA for 4f28f7c

Commits on Oct 11, 2016

• Fix method on manager's add command (#578) (#614)

  

  sorz

  authored and

  mengskysama

  committed
  5a05312

  Copy full SHA for 5a05312

Commits on Nov 20, 2016

• fix that autoban can not get ip when use ipv6 (#674)

  

  littlezz

  authored and

  mengskysama

  committed
  6dae6e2

  Copy full SHA for 6dae6e2

• Fixed #675 (#676)

  Show description for 72f1d68
  

  loggerhead

  authored and

  mengskysama

  committed
  72f1d68

  Copy full SHA for 72f1d68

• Update README.md (#643)

  

  casouri

  authored and

  mengskysama

  committed
  229ec75

  Copy full SHA for 229ec75

• new debian package (#659)

  Show description for d31003e
  

  shell909090

  authored and

  mengskysama

  committed
  d31003e

  Copy full SHA for d31003e

Commits on Jan 2, 2017

• Update README.md (#697)

  Show description for bdefeb5
  

  anthonywong

  authored and

  mengskysama

  committed
  bdefeb5

  Copy full SHA for bdefeb5

• update regex to support hostnames containing underscore (#694)

  

  Lution

  authored and

  mengskysama

  committed
  392e54e

  Copy full SHA for 392e54e

• 2.9.1

  mengskysama

  committed
  ad39d95

  Copy full SHA for ad39d95

Commits on Feb 28, 2017

• parse dns_servre in config (#739)

  Show description for 8ac72b0
  

  supermariogo

  authored and

  mengskysama

  committed
  8ac72b0

  Copy full SHA for 8ac72b0

• Correct spelling. (#755)

  Show description for fe13c20
  

  tssujt

  authored and

  mengskysama

  committed
  fe13c20

  Copy full SHA for fe13c20

Commits on Mar 2, 2017

• add simple ss-tunnel to shadowsocks for dns forward (#759)

  Show description for e06819c
  

  Falseen

  authored and

  mengskysama

  committed
  e06819c

  Copy full SHA for e06819c

• Update README.md (#575)

  Show description for c4731de
  

  elvisw

  authored and

  mengskysama

  committed
  c4731de

  Copy full SHA for c4731de

Commits on Mar 4, 2017

• Add AEAD ciphers support (#775)

  Show description for 445a3c9
  

  made-by-love

  authored and

  mengskysama

  committed
  445a3c9

  Copy full SHA for 445a3c9

• encrypt.py is renamed to cryptor.py (#780)

  

  made-by-love

  authored and

  mengskysama

  committed
  d6b40ef

  Copy full SHA for d6b40ef

Commits on Mar 10, 2017

• Add sodium:aes-256-gcm and openssl:ocb AEAD mode (#784)

  Show description for 74f8f8c
  

  made-by-love

  authored and

  mengskysama

  committed
  74f8f8c

  Copy full SHA for 74f8f8c

Commits on Mar 14, 2017

• Handle cipher exceptions #783 (#791)

  

  made-by-love

  authored and

  mengskysama

  committed
  4e21f83

  Copy full SHA for 4e21f83

Commits on Mar 19, 2017

• fix some error for parse dns_servre in config (#798)

  Show description for 9e25cc6
  

  Falseen

  authored and

  mengskysama

  committed
  9e25cc6

  Copy full SHA for 9e25cc6

Commits on Mar 21, 2017

• update find_lib's name for the new openssl-1.1 dll (just for windows) (#796)

  Show description for 1222fb1
  

  Falseen

  authored and

  mengskysama

  committed
  1222fb1

  Copy full SHA for 1222fb1

Commits on Apr 29, 2017

• Add mbedtls wrapper, custom crypto lib path, test files (#803)

  Show description for 0f4e3fa
  

  made-by-love

  authored and

  mengskysama

  committed
  0f4e3fa

  Copy full SHA for 0f4e3fa

• Fix memory leak when excpetions occur (#814)

  

  made-by-love

  authored and

  mengskysama

  committed
  06b028b

  Copy full SHA for 06b028b

Commits on May 12, 2017

• Fix udp dns issue under python3 (#849)

  Show description for 13b5d6e
  

  made-by-love

  authored and

  mengskysama

  committed
  13b5d6e

  Copy full SHA for 13b5d6e

• Update README.md (#841)

  Show description for d5026cf
  

  tedlz123

  authored and

  mengskysama

  committed
  d5026cf

  Copy full SHA for d5026cf

Commits on Sep 6, 2017

• Fix memory leak (#921)

  Show description for 893f909
  

  esdeathlove

  authored and

  mengskysama

  committed
  893f909

  Copy full SHA for 893f909

• Improve lru_cache. Update test for it (#897)

  

  MinweiShen

  authored and

  mengskysama

  committed
  3c82f02

  Copy full SHA for 3c82f02

• Update README.md (#734)

  Show description for 91e6237
  

  anthonywong

  authored and

  mengskysama

  committed
  91e6237

  Copy full SHA for 91e6237

• Add new file snapcraft.yaml for building snap package (#932)

  

  anthonywong

  authored and

  mengskysama

  committed
  0b0379b

  Copy full SHA for 0b0379b

• Update .travis.yml

  Show description for 0168be7
  mengskysama

  authored
  0168be7

  Copy full SHA for 0168be7

• Fix typo (#866)

  

  apemost

  authored and

  mengskysama

  committed
  f7d7aee

  Copy full SHA for f7d7aee

• Update jenkins.sh

  Show description for 2ab8c6b
  mengskysama

  authored
  2ab8c6b

  Copy full SHA for 2ab8c6b

Commits on Feb 18, 2018

• update run_method() (#1161)

  mengskysama

  authored
  8b30264

  Copy full SHA for 8b30264

• Update README.md (#1042)

  

  netroby

  authored and

  mengskysama

  committed
  c668f44

  Copy full SHA for c668f44

Commits on Feb 19, 2018

• use list instead of string, prevent injection attack. (#1009)

  Show description for e332ec9
  

  shell909090

  authored and

  mengskysama

  committed
  e332ec9

  Copy full SHA for e332ec9

Commits on Dec 19, 2018

• Fix #1209 (#1212)

  Show description for 5ff694b
  

  shadowsocked

  authored and

  mengskysama

  committed
  5ff694b

  Copy full SHA for 5ff694b