commit a32ca313c4bc67d56af5f345fa0129b50c006b12 Merge: f258064 5854b19 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 2 10:12:56 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

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