commit 3e2d061397f451ba7b818d9b5b407523b2be4b89 Merge: e32281b 36b2b48 Author: Nick Mathewson nickm@torproject.org Date: Wed May 25 16:58:58 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug18668 | 3 +++ src/test/testing_common.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)