commit c4031ee847ab834445d809ace0efc09b9fd46c7c Merge: 99703c9 d1dbaf2 Author: Nick Mathewson nickm@torproject.org Date: Sat Sep 21 08:55:45 2013 -0400

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

src/or/connection_or.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)