commit 70b16bc679435c5168d7d8f47a36d72bff24c0d8 Merge: ba1bb90a7 c515dc8d0 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 30 09:08:39 2018 -0400 Merge branch 'ticket26890' src/lib/log/util_bug.c | 4 ---- src/lib/log/util_bug.h | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-)