[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit adae5d3b69fdac78cd6fba428e3bff61d71f4bff
Merge: c8e6b2e 15b1357
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 16:11:48 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 src/common/util.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)