Merge remote-tracking branch 'dgoulet/bug20570_030_01'
commit0980787f91cfc420f02dead3fea99882ab8c2ada
authorNick Mathewson <nickm@torproject.org>
Thu, 10 Nov 2016 14:28:31 +0000 (10 09:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 10 Nov 2016 14:28:31 +0000 (10 09:28 -0500)
treee1d91f111edd1f7c0bf13d87a09b886b51c2ba64
parent5e16c3f5fabbf9d2595157b1e7788a0e942a6e5e
parent18e0a0b70d38ae2f72f4d118e282ab57efb7ef80
Merge remote-tracking branch 'dgoulet/bug20570_030_01'
src/test/test_hs_descriptor.c