]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/bug27550_035_01'
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Sep 2018 12:36:09 +0000 (08:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Sep 2018 12:36:09 +0000 (08:36 -0400)
1  2 
src/feature/dirclient/dirclient.c
src/feature/hs/hs_client.c

Simple merge
Simple merge