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

[nickm at torproject.org]

commit 8335b1f9a91076f100e7d3ba6b45f3ed9fc2986a
Merge: 83dfcfb db81565
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 18 20:00:16 2016 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

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