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

[nickm@xxxxxxxxxxxxxx]

commit ded58777c5332a343a4f427058c56a2e28f440ab
Merge: b5d738e c82881a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
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(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits