commit 021cf3f0521375f1722a7fb82ce286086db79142 Merge: 959da6b d25fead Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 1 12:54:51 2011 -0400

Merge branches 'cov217_021' and 'cid_450' into maint-0.2.1

changes/cid_450 | 5 +++++ src/common/compat.c | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)