Merge branch 'jennifer/march2016-patches'
authorJennifer Richards <jennifer@painless-security.com>
Mon, 20 Jun 2016 17:39:31 +0000 (13:39 -0400)
committerJennifer Richards <jennifer@painless-security.com>
Mon, 20 Jun 2016 17:39:31 +0000 (13:39 -0400)
commit5aeb22471d8d6d4a6c2348af8b221a8ff9b62184
tree9d0eac0d5a8874c4dcb572454c93024112fc5f67
parent7f85143212b8e2e5b11055c97b083119a756a812
parent1bc4bf57bafa273daa8a758d26c0e1b0ab7ad2af
Merge branch 'jennifer/march2016-patches'

Conflicts (both trivial):
common/tr_config.c
common/tr_name.c
common/tr_config.c
common/tr_name.c
include/tr_config.h
tr/tr_main.c