[proftpd-dfsg] 02/03: Merge tag 'upstream/1.3.5d'

[Francesco Lovergine]

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

frankie pushed a commit to branch master
in repository proftpd-dfsg.

commit 96398dbcf73874f9ccd1e8ef3aafcc84d8b71b97
Merge: d3f23b6 9317ad0
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Jan 31 10:28:42 2017 +0100

    Merge tag 'upstream/1.3.5d'
    
    Upstream version 1.3.5d

 .github/CONTRIBUTING.md       |    40 +
 .gitignore                    |     1 +
 .travis.yml                   |     1 +
 ChangeLog                     | 68119 ++++++++++++++++++----------------------
 NEWS                          |    21 +
 RELEASE_NOTES                 |    16 +
 configure                     |    86 +-
 configure.in                  |    46 +-
 contrib/dist/rpm/proftpd.spec |     4 +-
 contrib/mod_ldap.c            |    21 +-
 contrib/mod_sftp/cipher.c     |   113 +-
 contrib/mod_sftp/cipher.h     |     7 +-
 contrib/mod_sftp/compress.c   |     4 +-
 contrib/mod_sftp/crypto.c     |   171 +-
 contrib/mod_sftp/fxp.c        |    18 +-
 contrib/mod_sftp/kbdint.c     |     8 +-
 contrib/mod_sftp/kex.c        |   463 +-
 contrib/mod_sftp/keys.c       |   389 +-
 contrib/mod_sftp/mac.c        |   164 +-
 contrib/mod_sftp/mod_sftp.c   |     6 +-
 contrib/mod_sftp/msg.c        |    41 +-
 contrib/mod_sftp/packet.c     |     2 +
 contrib/mod_sftp/scp.c        |    38 +-
 contrib/mod_sql.c             |    16 +-
 contrib/mod_sql_mysql.c       |    15 +-
 contrib/mod_sql_passwd.c      |    35 +-
 contrib/mod_sql_sqlite.c      |    51 +-
 contrib/mod_tls.c             |   615 +-
 contrib/mod_tls.h             |     2 +-
 contrib/mod_tls_shmcache.c    |    18 +-
 doc/modules/mod_auth.html     |   149 +-
 include/version.h             |     4 +-
 modules/mod_auth.c            |    19 +-
 modules/mod_cap.c             |    12 +-
 modules/mod_facl.c            |   229 +-
 modules/mod_facts.c           |    23 +-
 modules/mod_ls.c              |    48 +-
 modules/mod_xfer.c            |     3 +
 src/auth.c                    |   160 +-
 src/data.c                    |    17 +-
 src/fsio.c                    |    10 +-
 src/memcache.c                |     9 +
 src/response.c                |    28 +-
 src/table.c                   |    10 +-
 tests/api/netacl.c            |    26 +-
 tests/api/netaddr.c           |    10 +-
 46 files changed, 32568 insertions(+), 38720 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-dfsg.git