commit 35fbec3719682197130d506e758cab2ce640ef7e Merge: 7e9f1d699 d1ec7bb06 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 15 12:47:46 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 src/common/util_bug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)