commit fa2d61370725488826eabaf80ec619bee32fdbf1 Merge: c06b5eb bb97f68 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)