[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6

[nickm at torproject.org]

commit c113544a94686f533c6654795429b3384d509579
Merge: ca03b10 732f522
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 23 09:25:15 2015 -0400

    Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6

 changes/bug15436   |    4 ++++
 src/ext/csiphash.c |   16 +++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)