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

[nickm at torproject.org]

commit ab58f60321ba6689fc89efb374e3a8ad8cc9808c
Merge: 0ace22e 8335b1f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 18 20:03:28 2016 -0500

    Merge branch 'maint-0.2.7'

 changes/bug18089    |    6 ++++++
 src/common/crypto.c |    8 ++++++++
 2 files changed, 14 insertions(+)