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

[nickm at torproject.org]

commit f557a7f327d6574018f836e6d7ba767a6082c491
Merge: 7b6d7aa 534a0ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 19 08:30:48 2016 -0500

    Merge branch 'maint-0.2.7'

 src/common/crypto.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)