[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

[nickm at torproject.org]

commit 9a179ff75159476ef475a28bae2615cd7e2e4df7
Merge: 39b2f2d 254d63d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 14 15:45:54 2015 -0500

    Merge branch 'maint-0.2.7'

 src/test/include.am |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)