From: Peter Palfrader Date: Mon, 21 Sep 2009 11:16:44 +0000 (+0200) Subject: Merge branch 'debian-merge' into debian X-Git-Tag: tor-0.2.2.3-alpha~4^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b69f6fe82d6cd4efd4cb96bdc987cf88a46ad3b2;p=thirdparty%2Ftor.git Merge branch 'debian-merge' into debian * debian-merge: (95 commits) New upstream version: 0.2.2.2-alpha downgrade a log severity, since this event has been known Update to the "September 4 2009" ip-to-country file. bump to 0.2.2.2-alpha Revert "Teach connection_ap_can_use_exit about Exclude*Nodes" fix grammar / add changelog for the torify commit Fix compile on Snow Leopard Fix build warnings on OSX 10.5.8 Change the condition on the nonlive timeout counting. Add a couple of time helper functions. Fix typos and comments, plus two bugs Implement and document new network liveness algorithm. Fix some precision-related asserts in unit tests. replace contrib/auto-naming with a readme saying where it went clarify our rules for assigning the Named flag disable the end of circuitbuildtimeout units tests draw in a lot of 0.2.1.20 changelog items into 0.2.2.2-alpha Fix compile on freebsd Let our config abbreviations rewrite more than once a mish-mash of stuff in my sandbox ... --- b69f6fe82d6cd4efd4cb96bdc987cf88a46ad3b2