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

[nickm at torproject.org]

commit 61c0bae4f20556cf155562582ea00a6a147252d6
Merge: 7fe80c2 85c698d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 9 18:14:27 2016 -0400

    Merge branch 'bug19008_027' into maint-0.2.7

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