commit 3c017e823bdcfeea4316755b208fa2bf9df5fb00 Merge: f5d2f79ac 6d3c5b8fb Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 26 12:53:38 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

changes/bug22915 | 3 +++ src/common/util.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+)