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

[nickm at torproject.org]

commit 0087fe36c10554dca69697912fceb1a97601e1ca
Merge: fda7f00 19cf074
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 23 10:03:35 2016 -0500

    Merge remote-tracking branch 'dgoulet/bug20572_030_01'

 src/or/hs_cache.c             |  2 +-
 src/or/hs_descriptor.c        | 64 +++++++++++++++--------------
 src/or/hs_descriptor.h        | 11 ++---
 src/test/test_hs_cache.c      | 93 ++++++++++++++++++++++++++-----------------
 src/test/test_hs_descriptor.c | 79 +++++++++++++++++++++---------------
 5 files changed, 146 insertions(+), 103 deletions(-)