commit 852b1312812bd0174353271c5a2d42ed08c6b8a2 Merge: 642cff5 866a282 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 14 17:22:23 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/control.c changes/bug3577 | 4 ++++ src/or/control.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-)