[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/646'

nickm at torproject.org nickm at torproject.org
Sun Feb 24 22:17:21 UTC 2019


commit 69238ca2da923c8a50d5c1007f3e702eea163b50
Merge: 34601105a c985940de
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 24 17:17:16 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/646'

 changes/ticket25417           |  4 ++++
 src/feature/control/control.c | 26 ++++++++++++++++++++------
 src/feature/hs/hs_client.c    | 18 ++++++++++++++++++
 src/feature/hs/hs_client.h    |  4 ++++
 src/feature/hs/hs_control.c   | 14 ++++++++++++++
 src/feature/hs/hs_control.h   |  4 ++++
 6 files changed, 64 insertions(+), 6 deletions(-)



More information about the tor-commits mailing list