commit 0ec135b6965b4b02de7dd6f695293df6e179a4a8 Merge: bd80ba9 42d877f Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 9 11:14:03 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.6'

changes/15188 | 3 +++ src/test/testing_common.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-)