      cfg->hangup_forked_call = PJ_TRUE;
  
      cfg->use_timer = PJSUA_SIP_TIMER_OPTIONAL;
-@@ -190,6 +209,9 @@
- #endif
+@@ -193,6 +212,9 @@
      pj_list_init(&cfg->reg_hdr_list);
+     pj_list_init(&cfg->sub_hdr_list);
      cfg->call_hold_type = PJSUA_CALL_HOLD_TYPE_DEFAULT;
 +#if defined(PJMEDIA_HAS_ZRTP) && (PJMEDIA_HAS_ZRTP != 0)
 +    cfg->zrtp_media_setting = pjsua_var.ua_cfg.zrtp_media_setting;

 
 err_status_t
 aes_icm_set_iv(aes_icm_ctx_t *c, void *iv);
diff -u -r -N -d --strip-trailing-cr -I '\$Id:.*\$' -I '\$Id\$' original/third_party/srtp/crypto/include/auth.h zorg/third_party/srtp/crypto/include/auth.h
--- original/third_party/srtp/crypto/include/auth.h	2008-01-23 21:17:42.299488000 +0100
+++ zorg/third_party/srtp/crypto/include/auth.h	2010-11-26 16:21:58.352995000 +0100
@@ -48,6 +48,8 @@
 
 #include "datatypes.h"          

 /* Define if building for a CISC machine (e.g. Intel). */
 #define CPU_CISC 1
 
diff -u -r -N -d -I '\$Id:.*\$' -I '\$Id\$' diff\original/third_party/srtp/config_in.h diff\zorg/third_party/srtp/config_in.h
--- diff\original/third_party/srtp/config_in.h	2011-06-10 12:17:58.299110000 +0200
+++ diff\zorg/third_party/srtp/config_in.h	2011-06-10 12:17:58.299110000 +0200
@@ -54,6 +54,9 @@
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
