[tor-commits] [tor/master] Merge remote-tracking branch 'teor/feature8961-replaycache-sha256'

[nickm at torproject.org]

commit 2079ec9ee62e34fd46a12a7bba87a71df167d7ee
Merge: be30c61 2e9779e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 25 08:55:18 2015 -0500

    Merge remote-tracking branch 'teor/feature8961-replaycache-sha256'

 changes/feature8961-replaycache-sha256 |    4 ++++
 src/or/replaycache.c                   |   26 ++++++++++++------------
 src/or/replaycache.h                   |    2 +-
 src/test/test_replay.c                 |   34 +++++++++++++++++++++++++++++++-
 4 files changed, 51 insertions(+), 15 deletions(-)