commit cb8059b42dddf25cdfc516a0e7fa869f2b727aee Merge: 25c9e3a 75d8ad7 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Nov 25 14:54:04 2011 -0500 Merge remote-tracking branch 'sebastian/pure_removal' changes/pure_removal | 7 +++++++ src/common/address.h | 4 ++-- src/common/compat.h | 12 +++++------- src/common/container.h | 28 +++++++++++----------------- src/common/util.h | 46 +++++++++++++++++++++------------------------- src/or/config.h | 2 +- 6 files changed, 47 insertions(+), 52 deletions(-)