www.project-moonshot.org Git - trust_router.git/commit

projects / trust_router.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ee6787f 7b8f06e)

author	Jennifer Richards <jennifer@painless-security.com>
	Wed, 10 Aug 2016 18:29:01 +0000 (14:29 -0400)
committer	Jennifer Richards <jennifer@painless-security.com>
	Wed, 10 Aug 2016 18:29:01 +0000 (14:29 -0400)
commit	e427f7d366115d72ded50c2d8de7e7c4c37a773f
tree	d52094b02c08e00e404b707ba0ef013c1de62d4a	tree \| snapshot
parent	ee6787f44e1c2507add20b083a2d652b34632f32	commit \| diff
parent	7b8f06ede21c614637e8bdc322bac9a95a44996e	commit \| diff

Merge branch 'master' into jennifer/trp-devel

Conflicts:
common/tr_config.c
common/tr_name.c
include/tr_config.h
include/trust_router/tid.h
tr/tr_main.c

common/tr_comm.c	diff1 \|	diff2 \|	blob \| history
common/tr_config.c	diff1 \|	diff2 \|	blob \| history
common/tr_name.c	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
include/tr_config.h	diff1 \|	diff2 \|	blob \| history
include/trust_router/tid.h	diff1 \|	diff2 \|	blob \| history

Moonshot Trust Router