Merge branch 'master' of moonshot.suchdamage.org:/srv/git/trust_router

diff --cc Makefile.am
index 63f273a,babfcf7..a2adee5
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -9,13 -9,12 +9,13 @@@ common/tr_dh.c 
  
  lib_LTLIBRARIES = libtr_tid.la
  
- tr_tr_SOURCES = tr/tr_main.c \
+ tr_trust_router_SOURCES = tr/tr_main.c \
  common/tr_config.c \
  common/tr_idp.c \
 +common/tr_comm.c \
  tr/tr.c
  
- tr_tr_LDADD = gsscon/libgsscon.la libtr_tid.la
+ tr_trust_router_LDADD = gsscon/libgsscon.la libtr_tid.la
  
  tid_example_tidc_SOURCES = tid/example/tidc_main.c 
  

diff --cc include/trust_router/tid.h
Simple merge

diff --cc tid/tidc.c
Simple merge