[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 339a47e80bcb898f96e41b9110dda07dd3a2fd05
Merge: 1987894 e4bc757
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 15 00:03:29 2014 -0500

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

 changes/bug10904       |    5 +++++
 src/common/compat.h    |    2 ++
 src/common/container.h |   46 ++++++++++++++++++++++++++++------------------
 src/ext/ht.h           |   16 ++++++++--------
 4 files changed, 43 insertions(+), 26 deletions(-)