commit 26c022ecbcbf4fb4541c4103b5fc94831d50d92b Merge: d4a61c7 7f85509 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 27 17:26:40 2011 -0400

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

changes/clear_trackexithost | 5 +++++ src/or/connection_edge.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)