commit 5faa017b86c0ab3ec4ffc22c9ec8d6c1a67d58ea Merge: a3de2df 6344345 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 29 15:09:55 2015 -0500

Merge remote-tracking branch 'public/ticket11737'

changes/ticket11737 | 4 ++++ src/ext/ht.h | 24 ++++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-)