commit bb32475c0b8fd239c0e070b8f3f78096370c5b53 Merge: c7912909e 6d3c5b8fb Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 26 12:53:37 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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