Wireshark-commits: [Wireshark-commits] master-2.0 d4bf5f0: Update c-ares to 1.12.0
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 29 Sep 2016 23:20:28 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d4bf5f061ff4cb2d045b43cea3809a5bf7d7b8fa
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

d4bf5f0 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Update c-ares to 1.12.0
    
    Change-Id: Icd70f5e4e5e1a41a6a188500874a893433ecb8ed
    Reviewed-on: https://code.wireshark.org/review/17985
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit d8a2d39d429ad20707eafc05399e640521d66f57)
    Conflicts:
    	tools/win-setup.ps1
    Reviewed-on: https://code.wireshark.org/review/17987
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  194b63a   ssl: fix exact matching of ALPN protocol names
    adds  d4bf5f0   Update c-ares to 1.12.0


Summary of changes:
 Makefile.nmake      |    2 +-
 config.nmake        |    4 ++--
 tools/win-setup.ps1 |   12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)