[Forensics-changes] [yara] 286/368: Merge remote-tracking branch 'upstream/master'

[Hilko Bengen]

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

bengen pushed a commit to annotated tag v3.5.0
in repository yara.

commit d1213f4ea05cef1a0b6fbfee17f68ce927f659b3
Merge: dfc2f2a d7699c6
Author: Christian Blichmann <cblichmann at google.com>
Date:   Tue May 31 11:06:39 2016 +0200

    Merge remote-tracking branch 'upstream/master'

 .travis.yml                        |  12 +-
 configure.ac                       |   7 +
 docs/writingrules.rst              |   4 +-
 libyara/ahocorasick.c              | 749 +++++++++++++++++++++++--------------
 libyara/arena.c                    |  18 +-
 libyara/atoms.c                    |  16 +
 libyara/compiler.c                 |  60 ++-
 libyara/exception.h                |   2 +
 libyara/include/yara/ahocorasick.h |  43 ++-
 libyara/include/yara/compiler.h    |   3 +-
 libyara/include/yara/types.h       | 260 +++++++------
 libyara/modules/pe.c               |   2 +-
 libyara/parser.c                   |  45 +--
 libyara/re.c                       |   2 +-
 libyara/rules.c                    |  89 +++--
 tests/test-alignment.c             |  43 +--
 tests/util.c                       |   2 +
 tests/util.h                       |   2 +
 yara.c                             |   4 +-
 yarac.c                            |   4 +-
 20 files changed, 804 insertions(+), 563 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git