[Cryptech-Commits] [user/jakob/tamper] 06/06: Merge remote-tracking branch 'ft/master'

[git at cryptech.is]

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

jakob at kirei.se pushed a commit to branch master
in repository user/jakob/tamper.

commit 2b6a62adaaaf0396fd401d2aef6f45ac1a0da23c
Merge: 82418cd ec079fc
Author: Jakob Schlyter <jakob at kirei.se>
AuthorDate: Sat Jul 16 15:10:05 2016 +0200

    Merge remote-tracking branch 'ft/master'

 Makefile |  2 +-
 tamper.c | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)