<p>Sync the two branches.</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>&nbsp;&nbsp;<a href='https://github.com/OpenSIPS/opensips/pull/633'>https://github.com/OpenSIPS/opensips/pull/633</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>proto_tls: new module tls_mgm</li>
  <li>proto_tls: added tls_mgm dependency; simplified tls_conn_init</li>
  <li>tls_mgm: fixed exports; improved find_server_domain api function</li>
  <li>proto_tls: readme updated</li>
  <li>tls_mgm: added readme</li>
  <li>proto_tls: modify mod_init</li>
  <li>tls_mgm: update dependency list; modify mod_init</li>
  <li>tls_mgm: update readme</li>
  <li>proto_tls: update readme</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-0">modules/proto_tls/README</a>
    (917)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-1">modules/proto_tls/doc/proto_tls.xml</a>
    (1)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-2">modules/proto_tls/doc/proto_tls_admin.xml</a>
    (970)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-3">modules/proto_tls/proto_tls.c</a>
    (1014)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-4">modules/proto_tls/tls_server.c</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-5">modules/proto_tls/tls_server.h</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-6">modules/tls_mgm/Makefile</a>
    (51)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-7">modules/tls_mgm/README</a>
    (1260)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-8">modules/tls_mgm/api.h</a>
    (47)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-9">modules/tls_mgm/doc/tls_mgm.xml</a>
    (107)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-10">modules/tls_mgm/doc/tls_mgm_admin.xml</a>
    (1172)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-11">modules/tls_mgm/doc/tls_mgm_devel.xml</a>
    (137)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-12">modules/tls_mgm/tls.h</a>
    (137)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-13">modules/tls_mgm/tls_config.c</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-14">modules/tls_mgm/tls_config.h</a>
    (13)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-15">modules/tls_mgm/tls_config_helper.h</a>
    (25)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-16">modules/tls_mgm/tls_domain.c</a>
    (46)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-17">modules/tls_mgm/tls_domain.h</a>
    (35)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-18">modules/tls_mgm/tls_helper.h</a>
    (36)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-19">modules/tls_mgm/tls_mgm.c</a>
    (1152)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-20">modules/tls_mgm/tls_params.c</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-21">modules/tls_mgm/tls_params.h</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-22">modules/tls_mgm/tls_select.c</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/OpenSIPS/opensips/pull/633/files#diff-23">modules/tls_mgm/tls_select.h</a>
    (0)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/OpenSIPS/opensips/pull/633.patch'>https://github.com/OpenSIPS/opensips/pull/633.patch</a></li>
  <li><a href='https://github.com/OpenSIPS/opensips/pull/633.diff'>https://github.com/OpenSIPS/opensips/pull/633.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">&mdash;<br>Reply to this email directly or <a href="https://github.com/OpenSIPS/opensips/pull/633">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AFOciaBz8QdIhkBQFgbulbqLD65sABnhks5oxopzgaJpZM4F8s34.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/OpenSIPS/opensips/pull/633"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>