From: Andrea Shepard Date: Sat, 10 Nov 2012 11:24:41 +0000 (-0800) Subject: Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org... X-Git-Tag: tor-0.2.4.6-alpha~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0523c8de7d7f775e9a89134340f88ae00bde158b;p=thirdparty%2Ftor.git Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org/user/andrea/tor --- 0523c8de7d7f775e9a89134340f88ae00bde158b