commit b8e8910d60e41844ce4ab37d9306cb8e8b5aec91 Merge: 31332a8 c7b9e0b Author: Nick Mathewson nickm@torproject.org Date: Wed May 4 15:12:11 2016 -0400

Merge branch 'bug18686_025' into maint-0.2.8

changes/bug18686 | 5 +++++ src/common/util.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)