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

[nickm at torproject.org]

commit ac3b559e934b02d2fa690ea7dcd2e7e92553dc9e
Merge: f31b385 870b5e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 12:52:52 2017 -0500

    Merge branch 'bug20569_030_02_squashed'

 src/common/crypto.h    |  6 ++++--
 src/or/hs_descriptor.c | 14 ++++++++------
 src/or/hs_descriptor.h |  8 +++++++-
 3 files changed, 19 insertions(+), 9 deletions(-)