commit 15b13578e89e79d1f2199e05e0b4faba2b64bf9d Merge: 9383fa3 55777b3 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 16:11:48 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

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