commit 36b2b483082eeb43e2aac80cf72b36b35cb48473 Merge: f2d614c 0f9b0b8 Author: Nick Mathewson nickm@torproject.org Date: Wed May 25 16:58:43 2016 -0400

Merge branch 'bug18668_028' into maint-0.2.8

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