commit 99703c9b31375933eede574e1718582743e67d38 Merge: 6178aae 4f036ac Author: Roger Dingledine arma@torproject.org Date: Sat Sep 21 02:21:15 2013 -0400

Merge branch 'maint-0.2.4'

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