[tor-commits] [tor/master] Merge branch 'bug21594_030_squashed' into maint-0.3.0

[nickm@xxxxxxxxxxxxxx]

commit 552bc39c327624555034df40c3646fb88a6dc85b
Merge: 333d5d0 93ede05
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Mar 7 08:05:16 2017 -0500

    Merge branch 'bug21594_030_squashed' into maint-0.3.0

 changes/bug21594     |  5 +++++
 src/or/rendservice.c | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)




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