commit 10ac393293a89f44b635d109d441709b073b2966 Merge: 036e60a 55777b3 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 16:11:48 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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