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

[nickm at torproject.org]

commit ded58777c5332a343a4f427058c56a2e28f440ab
Merge: b5d738e c82881a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 17 20:12:13 2016 -0500

    Merge remote-tracking branch 'dgoulet/bug20629_030_01'

 src/or/hs_descriptor.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)