commit 190ed66b06833bcf3016e93f1c4ad98d1ebdb98d Merge: 98c3942 c113544 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 23 09:25:35 2015 -0400

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

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