commit 08ced4a7bf17f5c9d2868649dfa844248d15614e Merge: 689863d 9ccedbe Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 8 16:46:34 2014 -0400

Merge remote-tracking branch 'public/bug11426'

changes/bug11426 | 3 +++ src/ext/csiphash.c | 4 ++++ 2 files changed, 7 insertions(+)