Merge remote-tracking branch 'dgoulet/bug27550_035_01'
commit5e5e019b31296b5a829afc4f7f3766697888b678
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Sep 2018 12:36:09 +0000 (26 08:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Sep 2018 12:36:09 +0000 (26 08:36 -0400)
tree204a6623bafc7f9380c9c2239fc1572f42df0f25
parentc82163dff468443d28b6d0c9b1253f7721eb3fdc
parent36be6f0d2d9a518ebd1d914e70b07c1967bf235e
Merge remote-tracking branch 'dgoulet/bug27550_035_01'
src/feature/dirclient/dirclient.c
src/feature/hs/hs_client.c