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

[nickm at torproject.org]

commit 9fb2bf2f3f5ae63da8e8c043f3f8488a6aad0ded
Merge: d528690 3ee9a6d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 23 08:28:05 2016 -0500

    Merge remote-tracking branch 'dgoulet/bug19899_030_01'

 src/or/directory.c | 14 --------------
 src/or/hs_common.c | 15 ---------------
 src/or/hs_common.h |  2 --
 3 files changed, 31 deletions(-)