commit 666e491958b420ea394bc518f4263b00b544b64f
author Anestis Bechtsoudis <anestis@census-labs.com> Tue Sep 08 20:33:54 2015 +0300
committer Anestis Bechtsoudis <anestis@census-labs.com> Tue Sep 08 20:33:54 2015 +0300
tree 76b40a8d5ffa4ee9e7cdb597384df9721732095a
parent 2a155c465d2793d311bf9352058a411e16318fa8
parent 6e08d46b56c7c4c9ac9a0cfddc5d2c45b8826d30

Merge branch 'master' of https://github.com/google/honggfuzz

# By Robert Swiecki
# Via Robert Swiecki
* 'master' of https://github.com/google/honggfuzz:
  Simplify signal handling
  Display: don't display dynamic counters if dynamic modes are not used
  Use prlimit64 to allow fuzzing 64bit processes from 32bit honggfuzz
  Display, Log: use mutex to synchronize display and log modules
  Dynamic feedback: We only care about improving counters
  Get rid of semaphores. Signals rule

Signed-off-by: Anestis Bechtsoudis <anestis@census-labs.com>

Conflicts:
	linux/ptrace_utils.c

Conflict manually resolved to keep compatibility with
pending merge dynamic workspace feature.