[tor-commits] [tor/master] Merge branch 'bug20599_030_v4'

[nickm@xxxxxxxxxxxxxx]

commit e317a9cb7c91fac7b3583a86361d6bd613f18ee4
Merge: 6f101f9 b917b38
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Dec 2 07:47:32 2016 -0500

    Merge branch 'bug20599_030_v4'

 changes/bug20559     |   4 ++
 src/common/util.c    |   8 +++-
 src/or/rendservice.c | 115 ++++++++++++++++++++++++++++-----------------------
 3 files changed, 73 insertions(+), 54 deletions(-)

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