[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.1'

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