commit bac6d542c912f733aa6103c47ef41423848fef7c Merge: 5ad8721 542b470 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 31 11:15:49 2014 -0400

Merge branch 'digest256map'

changes/bug13399_part1 | 3 + src/common/container.c | 673 ++++++++++++++++++++---------------------------- src/common/container.h | 10 + 3 files changed, 287 insertions(+), 399 deletions(-)