commit 123337bbc998b39929da76a379331417f8580833 Merge: 72391fce2 42e7d0ea1 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 15 08:15:36 2017 -0400 Merge remote-tracking branch 'teor/ticket23528' src/common/util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)