]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge changes from topics 'ASTERISK-26890', 'ASTERISK-26851' into 13
authorJoshua Colp <jcolp@digium.com>
Wed, 12 Apr 2017 09:55:12 +0000 (04:55 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 12 Apr 2017 09:55:12 +0000 (04:55 -0500)
* 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.


Trivial merge