From: Joshua Colp <jcolp@digium.com>
Date: Wed, 12 Apr 2017 09:55:12 +0000 (-0500)
Subject: Merge changes from topics 'ASTERISK-26890', 'ASTERISK-26851' into 13
X-Git-Tag: 13.16.0-rc1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdc63152c38381b50ed5195e9fd09b905a9e536a;p=thirdparty%2Fasterisk.git

Merge changes from topics 'ASTERISK-26890', 'ASTERISK-26851' into 13

* changes:
  stun.c: Fix ast_stun_request() erratic timeout.
  sorcery.c: Speed up ast_sorcery_retrieve_by_id()
  res_pjsip: Fix pointer use after unref.
  res_pjsip_sdp_rtp.c: Don't use deprecated transport struct member.
---

fdc63152c38381b50ed5195e9fd09b905a9e536a