commit b458a81cc501fb56d72f3312b8b407f9be323e9b Merge: 3cdc8bf a32ca31 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 2 10:13:35 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug19213 | 3 +++ src/test/test_util.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)