[Python-modules-commits] [python-bcrypt] 02/04: Merge tag 'upstream/3.1.4' into debian/master

[Daniel Stender]

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

stender pushed a commit to branch debian/master
in repository python-bcrypt.

commit 85fef95147e8e667906c35755864faea7db986e0
Merge: 795772f 21d37d6
Author: Daniel Stender <stender at debian.org>
Date:   Sun Nov 5 11:00:35 2017 +0100

    Merge tag 'upstream/3.1.4' into debian/master
    
    Upstream version 3.1.4
    
    # gpg: Signature made Sun 05 Nov 2017 11:00:32 AM CET
    # gpg:                using RSA key 46CB1CA89EA3B74376761DB915E09AF4DF5182C8
    # gpg: Good signature from "Daniel Stender <daniel at danielstender.com>" [unknown]
    # gpg:                 aka "Daniel Stender <debian at danielstender.com>" [unknown]
    # gpg:                 aka "Daniel Stender <stender at debian.org>" [unknown]
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: 46CB 1CA8 9EA3 B743 7676  1DB9 15E0 9AF4 DF51 82C8

 MANIFEST.in                      | 5 ++++-
 PKG-INFO                         | 8 +++++++-
 README.rst                       | 5 +++++
 setup.py                         | 4 ++--
 src/_csrc/bcrypt_pbkdf.c         | 4 ++--
 src/_csrc/blf.h                  | 3 ++-
 src/_csrc/pycabcrypt.h           | 6 ++++++
 src/bcrypt.egg-info/PKG-INFO     | 8 +++++++-
 src/bcrypt.egg-info/requires.txt | 2 +-
 src/bcrypt/__about__.py          | 2 +-
 src/bcrypt/__init__.py           | 2 +-
 tox.ini                          | 6 +++---
 12 files changed, 41 insertions(+), 14 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-bcrypt.git