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

Merge changes from topic 'ASTERISK-26890' into 14

* 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.
---

c4bbf0c0db7a5804be8efb6db5bf4ce251e40234