[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8

[nickm at torproject.org]

commit 5cd59791328c1a0e6987d83b9b55aeccbbf6eaf4
Merge: 55cf197 61c0bae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 9 18:14:44 2016 -0400

    Merge branch 'maint-0.2.7' into maint-0.2.8

 Makefile.am      | 2 +-
 changes/bug19008 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)