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

[nickm at torproject.org]

commit 534a0ba59b4d772b0e3e6a1dfc5050d534fdb9fc
Merge: 8335b1f e2efa9e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 19 08:30:39 2016 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

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