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

[nickm at torproject.org]

commit 3e45b12f38beca55f58ea612a9f77580e76e37d8
Merge: ac75c33 2d1fa58
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 13 16:45:55 2017 -0500

    Merge remote-tracking branch 'dgoulet/bug21054_030_01'

 changes/bug21054     |   5 ++
 src/or/circuitlist.c |  35 +++++++++++
 src/or/circuitlist.h |   1 +
 src/or/rendservice.c | 172 ++++++++++++++++++++++++++++-----------------------
 src/or/rendservice.h |   3 +
 src/test/test_hs.c   | 123 ++++++++++++++++++++++++++++++++++++
 6 files changed, 261 insertions(+), 78 deletions(-)