[tor-commits] [tor/master] Merge remote-tracking branch 'teor/memwipe-more-keys'

[nickm at torproject.org]

commit e3d166b7a63b4f0c248e20b759dba2ccb8d30092
Merge: d6fab2a 2e1f5c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 20 11:12:51 2014 -0400

    Merge remote-tracking branch 'teor/memwipe-more-keys'

 changes/bug13477-memwipe-more-keys |    5 +++++
 src/common/crypto.c                |    2 +-
 src/or/router.c                    |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)