torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
17,204 Commits 53 Branches 631 Tags
dab4656c85641b85a71ea167abe819548ffe4f5f
Commit Graph

17204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roger Dingledine dab4656c85 fold in further changes files 2014-02-25 15:36:25 -05:00
Roger Dingledine 4ef52cc167 Merge branch 'maint-0.2.4' into release-0.2.4 2014-02-25 15:05:06 -05:00
Nick Mathewson d7950eda2b Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2014-02-25 10:02:14 -05:00
Karsten Loesing 2658e70d16 Fix geoip by falling back to registered countries. 
See 1d2179bc90 in master for details.

"""
Fall back to registered country if necessary.

When extracting geoip and geoip6 files from MaxMind's GeoLite2 Country
database, we only look at country->iso_code which is the two-character ISO
3166-1 country code of the country where MaxMind believes the end user is
located.

But if MaxMind thinks a range belongs to anonymous proxies, they don't put
anything there.  Hence, we omit those ranges and resolve them all to '??'.
That's not what we want.

What we should do is first try country->iso_code, and if there's no such
key, try registered_country->iso_code which is the country in which the
ISP has registered the IP address.

In short: let's fill all A1 entries with what ARIN et. al think.
"""
 2014-02-25 13:28:34 +01:00
Nick Mathewson d21b24b3b6 Merge remote-tracking branch 'public/feature9777_024_squashed' into maint-0.2.4 2014-02-24 13:05:25 -05:00
Nick Mathewson e616f5b513 whoops; mistaek in a496010642. so many comma 2014-02-18 01:15:59 +00:00
Nick Mathewson 9f38cd9350 add changes file for bug 10929 2014-02-17 23:06:18 +00:00
dana koch a496010642 Enveigle configure to look for a2x.py as well as a2x. 
It's not guaranteed that every package symlinks a2x to a2x.py; OpenBSD
does not do this, so let's just look for a2x.py as well.
 2014-02-17 23:05:15 +00:00
Nick Mathewson bc58bfda70 Merge remote-tracking branch 'karsten/geoip6-feb2014' into maint-0.2.4 2014-02-15 00:06:40 -05:00
Nick Mathewson 260b3b1a19 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2014-02-15 00:06:25 -05:00
Nick Mathewson 405d055465 Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3 2014-02-15 00:06:01 -05:00
Nick Mathewson e4bc757cde changes file for bug 10904 2014-02-14 23:51:14 -05:00
Sebastian Hahn 3f567f529f gcc/clang: Mark macro-generated functions as possible unused 
clang 3.4 introduced a new by-default warning about unused static
functions, which we triggered heavily for the hashtable and map function
generating macros. We can use __attribute__ ((unused)) (thanks nickm for
the suggestion :-) ) to silence these warnings.
 2014-02-14 23:43:15 -05:00
Karsten Loesing f6f691df73 Update geoip6 to the February 2014 GeoIP database. 2014-02-13 19:04:51 +01:00
Nick Mathewson d6e6eaba60 Fix windows compilation of e0c8031516 
There is no WSAEPERM; we were implying that there was.This fixes a
bug in e0c8031516, which hadn't yet
appeared in any released Tor.
 2014-02-12 09:16:22 -05:00
Roger Dingledine 4428a14616 use the #10485 changelog stanza from 0.2.5.2-alpha 2014-02-12 04:02:44 -05:00
Nick Mathewson 91d4bb0b00 Merge branch 'bug10777_netunreach_024' into maint-0.2.4 2014-02-11 18:57:55 -05:00
Nick Mathewson 0844a262a2 update changes file 2014-02-11 18:57:38 -05:00
Nick Mathewson 8836c1ee2f Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4 2014-02-11 18:55:26 -05:00
Roger Dingledine cf2a78248f fold in changes entries 2014-02-11 06:23:41 -05:00
Roger Dingledine 911e0a71a6 Merge branch 'maint-0.2.4' into release-0.2.4 2014-02-10 16:41:13 -05:00
Nick Mathewson e0c8031516 make EACCES survivable too. 2014-02-10 15:06:10 -05:00
Nick Mathewson 7f6aa780e3 Merge remote-tracking branch 'andrea/bug9602' into maint-0.2.4 2014-02-09 21:41:24 -05:00
Nick Mathewson b15f75b632 Don't treat END_STREAM_REASON_INTERNAL as total circuit failure 
It can happen because we sent something that got an ENETUNREACH
response.

Bugfix on 0.2.4.8-alpha; fixes a part of bug 10777.
 2014-02-09 21:35:14 -05:00
Nick Mathewson f5d32c08ba Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL. 
Found by cypherpunks; fix for a part of bug 10777; bugfix on 0.1.0.1-rc.
 2014-02-09 21:30:23 -05:00
Andrea Shepard c330d63ff7 Make sure orconn->chan gets nulled out when channels exit from channel_free_all() too 2014-02-08 14:05:51 -08:00
Karsten Loesing 26dd328891 Update to the February 2014 GeoIP database. 2014-02-08 12:09:37 +01:00
Nick Mathewson 9bb34aa897 Survive fedora's openssl in our benchmarks 
Apparently fedora currently has ECDH but not P224. This isn't a huge
deal, since we no longer use OpenSSL's P224 ever (see #9780 and
72c1e5acfe). But we shouldn't have segfaulting benchmarks really.

Fixes bug 10835; bugfix on 0.2.4.8-alpha.
 2014-02-07 17:36:11 -05:00
Nick Mathewson 1068e50aec Discard circuit paths on which nobody supports ntor 
Right now this accounts for about 1% of circuits over all, but if you
pick a guard that's running 0.2.3, it will be about 6% of the circuits
running through that guard.

Making sure that every circuit has at least one ntor link means that
we're getting plausibly good forward secrecy on every circuit.

This implements ticket 9777,
 2014-02-07 10:45:34 -05:00
Nick Mathewson a7e946596d Attribute bug 9602 to a version. 2014-02-07 10:38:00 -05:00
Andrea Shepard 707c1e2e26 NULL out conns on tlschans when freeing in case channel_run_cleanup() is late; fixes bug 9602 2014-02-06 14:47:34 -08:00
Nick Mathewson b4e8d8dc0e Merge remote-tracking branch 'public/bug9716_024' into maint-0.2.4 2014-02-06 16:29:08 -05:00
Nick Mathewson 9e2de8cecc changelog for 10793 2014-02-06 16:09:12 -05:00
Florent Daigniere 01132c93fd Some anti-forensics paranoia... 
sed -i 's/BN_free/BN_clear_free/g'
 2014-02-06 16:09:12 -05:00
Nick Mathewson 655adbf667 Add a missing include 2014-02-06 13:25:36 -05:00
Nick Mathewson 534acf400e Merge branch 'bug10485_024' into maint-0.2.4 2014-02-06 13:24:12 -05:00
Nick Mathewson edc6fa2570 Deliver circuit handshake counts as part of the heartbeat 
Previously, they went out once an hour, unconditionally.

Fixes 10485; bugfix on 0.2.4.17-rc.
 2014-02-06 13:03:01 -05:00
Roger Dingledine d9c111d954 Merge branch 'maint-0.2.4' into release-0.2.4 2014-02-06 12:28:49 -05:00
Nick Mathewson 3511549651 Clarify DirPort multiplicity 
Fix for #10470 as suggested by arma
 2013-12-23 19:00:46 -05:00
Roger Dingledine 3cb5c70bee fold in next changes entry tor-0.2.4.20 2013-12-22 18:34:37 -05:00
Roger Dingledine ce43072831 Merge branch 'maint-0.2.4' into release-0.2.4 2013-12-22 18:31:50 -05:00
Nick Mathewson 59a162f7d2 Merge branch 'bug10465' into maint-0.2.4 2013-12-22 17:20:22 -05:00
Nick Mathewson b9f6e40ecb Fix automapping to ipv6 
Bugfix on 0.2.4.7-alpha; fixes bug 10465.
 2013-12-22 17:19:22 -05:00
Roger Dingledine 9f7be021f3 bump to 0.2.4.20 2013-12-22 04:21:42 -05:00
Roger Dingledine 8eb617dca3 write the release blurb for 0.2.4.20, and give it a date 2013-12-22 04:11:03 -05:00
Roger Dingledine 00285acca3 fold in changes files so far 2013-12-22 02:35:20 -05:00
Roger Dingledine 2349833f71 Merge branch 'maint-0.2.4' into release-0.2.4 2013-12-22 02:25:53 -05:00
Nick Mathewson 2c956f0c99 Merge branch 'bug10456' into maint-0.2.4 2013-12-21 21:15:39 -05:00
Nick Mathewson b5d13d11c9 Fix a logic error in circuit_stream_is_being_handled. 
When I introduced the unusable_for_new_circuits flag in
62fb209d83, I had a spurious ! in the
circuit_stream_is_being_handled loop.  This made us decide that
non-unusable circuits (that is, usable ones) were the ones to avoid,
and caused it to launch a bunch of extra circuits.

Fixes bug 10456; bugfix on 0.2.4.12-alpha.
 2013-12-21 10:15:09 -05:00
Nick Mathewson dabdc339fe Merge branch 'bug10402_redux_024' into maint-0.2.4 2013-12-18 21:55:06 -05:00