From: Nick Mathewson Date: Tue, 30 Dec 2014 14:06:47 +0000 (-0500) Subject: Merge branch 'no-exit-bootstrap-squashed' X-Git-Tag: tor-0.2.6.2-alpha~13 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b770ac7b7d8c44a28666da53921be3a2dedc94c;p=thirdparty%2Ftor.git Merge branch 'no-exit-bootstrap-squashed' --- 5b770ac7b7d8c44a28666da53921be3a2dedc94c