[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1

[nickm@xxxxxxxxxxxxxx]

commit 6307a759ed5ce48f31a5c36b08f2563cbb226389
Merge: 5e08cf350 6507ecb7e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Aug 29 11:11:09 2017 -0400

    Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1

 changes/bug22159     |  7 +++++++
 src/or/rendservice.c | 34 +++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 11 deletions(-)



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