commit f75660958cc62422d158f9284b7fcfdee9fa9b95 Merge: d7531b2 b5e6bbc Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 21 11:20:56 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug1240 | 8 ++++++++ src/or/connection.c | 27 ++++++++++----------------- 2 files changed, 18 insertions(+), 17 deletions(-)