commit 2384256a3719fbc31793228b0b34716b7817d15e Merge: e24c902 b8e8910 Author: Nick Mathewson nickm@torproject.org Date: Wed May 4 15:12:20 2016 -0400

Merge branch 'maint-0.2.8'

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