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

[nickm at torproject.org]

commit 9f343f8ee3cd0f7d36994b7c56a742f0ae6637ec
Merge: de4f461 dfc0614
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 16:11:48 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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