Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/tcs/rpc/tcstp/rpc_transport.c

Index: src/tcs/rpc/tcstp/rpc_transport.c
diff --git a/src/tcs/rpc/tcstp/rpc_transport.c b/src/tcs/rpc/tcstp/rpc_transport.c
index 2b56ccbcfa639a058945b2537c27354c68cd1b82..1993cb34559877168f7e9a4323c07f0eabe2a395 100644
--- a/src/tcs/rpc/tcstp/rpc_transport.c
+++ b/src/tcs/rpc/tcstp/rpc_transport.c
@@ -42,7 +42,7 @@ tcs_wrap_EstablishTransport(struct tcsd_thread_data *data)
 	if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
 
-	LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+	LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
 	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &ulTransControlFlags, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -148,7 +148,7 @@ tcs_wrap_ExecuteTransport(struct tcsd_thread_data *data)
 	if (getData(TCSD_PACKET_TYPE_UINT32, i++, &hContext, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
 
-	LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+	LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
 	if (getData(TCSD_PACKET_TYPE_UINT32, i++, &unWrappedCommandOrdinal, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -315,7 +315,7 @@ tcs_wrap_ReleaseTransportSigned(struct tcsd_thread_data *data)
 	if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
 
-	LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+	LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
 	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hSignatureKey, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);