Nick Mathewson
f3c20a28ab
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/circuituse.c
2014-04-15 14:51:19 -04:00
Nick Mathewson
b0e1ddbd98
Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3
2014-04-15 14:48:00 -04:00
Nick Mathewson
b2106956e0
Don't send uninitialized stack to the controller and say it's a date.
...
Fixes bug 11519, apparently bugfix on 0.2.3.11-alpha.
2014-04-14 21:51:30 -04:00
Nick Mathewson
149931571a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/routerlist.h
2014-04-14 18:00:38 -04:00
Nick Mathewson
75b4975d77
Merge branch 'bug11464_023_squashed' into maint-0.2.3
2014-04-14 17:59:01 -04:00
Nick Mathewson
09ed8a5dbb
Tweak changes file and comment dates.
2014-04-14 17:58:49 -04:00
Nick Mathewson
46cf63bb42
Fill in the list of blacklisted signing keys.
...
I used a list of certificate files from arma, and a little script,
both at 11464.
2014-04-14 17:57:39 -04:00
Nick Mathewson
50ad393924
Code to blacklist authority signing keys
...
(I need a list of actual signing keys to blacklist.)
2014-04-14 17:57:39 -04:00
Nick Mathewson
47f7085de7
Merge remote-tracking branch 'public/bug11437_024' into maint-0.2.4
2014-04-08 20:29:24 -04:00
Nick Mathewson
ab1a679eef
Fix a small memory leak when resolving PTR addresses
...
Fixes bug 11437; bugfix on 0.2.4.7-alpha.
Found by coverity; this is CID 1198198.
2014-04-07 23:29:47 -04:00
Nick Mathewson
48578e1512
Merge branch 'bug9213_doc_024' into maint-0.2.4
2014-04-01 20:59:13 -04:00
Nick Mathewson
a68e6ea9c0
Fix documentation of torrc search order
...
We are searching @CONFDIR@ before $HOME, but the documentation
implied otherwise.
I screwed this up in f5e86bcd6c
, when I
first documented the $HOME/.torrc possibility.
Fix for bug 9213; bugfix on 0.2.3.18-rc.
2014-04-01 20:56:03 -04:00
Nick Mathewson
24e0b1088a
whitespace fix
2014-03-27 15:34:57 -04:00
Nick Mathewson
a83abcf5ee
Fix unittest compilation with --disable-curve25519
...
This is a fix for 9700, which we already fixed in 0.2.5.x, but which
got left in 0.2.4.x.
This is a partial backport of a0a855d586
2014-03-20 13:53:32 -04:00
Nick Mathewson
9077118ee2
Remove the unused router_hex_digest_matches
...
When I removed some unused functions in 5bfa373eee
, this became
unused as well.
2014-03-11 11:17:46 -04:00
Nick Mathewson
cbf9e74236
Correct the URL in the "a relay on win95???" message
...
This is a fix for 9393; it's not a bugfix on any Tor version per se,
but rather on whatever Tor version was current when we reorganized the
wiki.
2014-03-06 09:57:42 -05:00
Nick Mathewson
c3800f631b
Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4
2014-02-25 15:58:53 -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
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
Nick Mathewson
e0c8031516
make EACCES survivable too.
2014-02-10 15:06:10 -05:00
Nick Mathewson
3133cde3c1
Excise the insertion_time_elem_t logic
...
It's now redundant with the inserted_time field in packed_cell_t
Fixes bug 10870.
2014-02-10 13:55:27 -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