commit 228b77f64e3d545e9d4dac2adc845ecd929c4ac5 Merge: 5f2a1a7 1b512fb Author: Nick Mathewson nickm@torproject.org Date: Sun May 15 11:17:54 2011 -0400

Merge branch 'bug2732-simpler' into maint-0.2.2

changes/bug2732-simple | 7 +++++++ src/or/routerlist.c | 18 ------------------ 2 files changed, 7 insertions(+), 18 deletions(-)