[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

[nickm at torproject.org]

commit 3eff8f38a5c2c3b65716cee7cda09a7458c94d7f
Merge: 97ca025 c113544
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 24 09:34:39 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

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