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

[nickm at torproject.org]

commit 3e2b48f8b4eee456c4aa81f640185382642fa75c
Merge: cfff582e4 4dc228e35
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 15 20:13:53 2018 -0500

    Merge branch 'bug24484_squashed'

 changes/bug24484  |  4 ++++
 configure.ac      | 15 +++++++++++++++
 src/common/util.h | 18 +++++++-----------
 3 files changed, 26 insertions(+), 11 deletions(-)