[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug20570_030_01'

[nickm at torproject.org]

commit 0980787f91cfc420f02dead3fea99882ab8c2ada
Merge: 5e16c3f 18e0a0b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 10 09:28:31 2016 -0500

    Merge remote-tracking branch 'dgoulet/bug20570_030_01'

 src/test/test_hs_descriptor.c | 102 ------------------------------------------
 1 file changed, 102 deletions(-)