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

[nickm@xxxxxxxxxxxxxx]

commit e8624b72a83074e00859581c34c23d4779f00010
Merge: b96bb82 922bc45
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Nov 3 19:09:42 2016 -0400

    Merge remote-tracking branch 'dgoulet/bug20526_030_01'

 src/or/rendservice.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)




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