Nick Mathewson
5b55778c86
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-24 09:19:06 -05:00
Nick Mathewson
137982f955
Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4
2014-11-24 09:18:36 -05:00
Nick Mathewson
8d5f1e6961
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-11-24 09:18:21 -05:00
Karsten Loesing
5441c733e0
Update geoip6 to the November 15 2014 database.
2014-11-24 14:23:18 +01:00
Karsten Loesing
8611c6bccd
Update geoip to the November 15 2014 database.
2014-11-24 14:21:31 +01:00
Nick Mathewson
0872d8e3cf
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-19 17:26:42 -05:00
Micah Anderson
dca902ceba
Update longclaw dirauth IP to be a more stable location
2014-11-19 17:22:25 -05:00
Nick Mathewson
6c146f9c83
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/config.c
2014-11-12 15:30:11 -05:00
Sebastian Hahn
0493db4adb
Add changes file for #13926
2014-11-12 15:25:52 -05:00
Micah Anderson
b6e7b8c88c
Remove turtles as a directory authority ( #13296 )
2014-11-12 15:25:52 -05:00
Micah Anderson
ad448c6405
Add longclaw as a directory authority ( #13296 )
2014-11-12 15:25:52 -05:00
Nick Mathewson
9e2608b0d3
bump version to 0.2.5.10-dev
2014-10-24 09:22:58 -04:00
Nick Mathewson
3202ac6006
bump maint-0.2.5 to 0.2.5.9-rc-dev
2014-10-20 10:32:09 -04:00
Nick Mathewson
af0fdb85e9
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-10-20 10:31:20 -04:00
Nick Mathewson
fed78bce8b
Whoops, bump the version properly.
2014-10-20 10:29:16 -04:00
Nick Mathewson
e2112dd0c0
bump maint-0.2.4 to 0.2.4.25-dev
2014-10-20 10:24:21 -04:00
Nick Mathewson
fd8f21e730
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-10-19 15:40:07 -04:00
Nick Mathewson
403c6ae78e
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-10-19 15:39:48 -04:00
Nick Mathewson
c1dd598df8
Note that our #13426 fix is also a #13471 fix.
...
See also http://marc.info/?l=openssl-dev&m=141357408522028&w=2
2014-10-19 15:38:44 -04:00
Nick Mathewson
ab4b29625d
Downgrade 'unexpected sendme cell from client' to PROTOCOL_WARN
...
Closes 8093.
2014-10-16 13:04:11 -04:00
Nick Mathewson
22b9caf0ae
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-10-16 09:08:52 -04:00
Nick Mathewson
943fd4a252
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-10-16 09:08:32 -04:00
Nick Mathewson
c1c83eb376
Merge branch 'no_sslv3_023' into maint-0.2.3
2014-10-16 09:08:09 -04:00
Nick Mathewson
af73d3e4d8
Disable SSLv3 unconditionally. Closes ticket 13426.
...
The POODLE attack doesn't affect Tor, but there's no reason to tempt
fate: SSLv3 isn't going to get any better.
2014-10-15 11:50:05 -04:00
Nick Mathewson
d315b8e8bc
Merge remote-tracking branch 'public/bug13325_024' into maint-0.2.5
2014-10-03 19:57:41 -04:00
Nick Mathewson
d1fa0163e5
Run correctly on OpenBSD systems without SSL_METHOD.get_cipher_by_char
...
Also, make sure we will compile correctly on systems where they
finally rip it out.
Fixes issue #13325 . Caused by this openbsd commit:
http://marc.info/?l=openbsd-cvs&m=140768179627976&w=2
Reported by Fredzupy.
2014-10-03 12:15:09 -04:00
Nick Mathewson
e1a25f0c36
Merge branch 'bug13295_v2_025' into maint-0.2.5
2014-09-29 13:02:35 -04:00
Nick Mathewson
09951bea7f
Don't use the getaddrinfo sandbox cache from tor-resolve
...
Fixes bug 13295; bugfix on 0.2.5.3-alpha.
The alternative here is to call crypto_global_init() from tor-resolve,
but let's avoid linking openssl into tor-resolve for as long as we
can.
2014-09-29 12:57:07 -04:00
Roger Dingledine
87576e826f
Merge branch 'maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/config.c
2014-09-20 16:50:32 -04:00
Roger Dingledine
288b3ec603
Merge branch 'maint-0.2.3' into maint-0.2.4
2014-09-20 16:49:24 -04:00
Sebastian Hahn
0eec8e2aa5
gabelmoo's IPv4 address changed
2014-09-20 16:46:02 -04:00
Nick Mathewson
be0e26272b
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-09-16 11:10:02 -04:00
Roger Dingledine
0c3b3650aa
clients now send correct address for rendezvous point
...
Clients now send the correct address for their chosen rendezvous point
when trying to access a hidden service. They used to send the wrong
address, which would still work some of the time because they also
sent the identity digest of the rendezvous point, and if the hidden
service happened to try connecting to the rendezvous point from a relay
that already had a connection open to it, the relay would reuse that
connection. Now connections to hidden services should be more robust
and faster. Also, this bug meant that clients were leaking to the hidden
service whether they were on a little-endian (common) or big-endian (rare)
system, which for some users might have reduced their anonymity.
Fixes bug 13151; bugfix on 0.2.1.5-alpha.
2014-09-16 11:05:36 -04:00
Nick Mathewson
550c03336c
Bump maint-0.2.5 to 0.2.5.7-rc-dev
2014-09-11 21:38:32 -04:00
Roger Dingledine
6215ebb266
Reduce log severity for unused ClientTransportPlugin lines
...
Tor Browser includes several ClientTransportPlugin lines in its
torrc-defaults file, leading every Tor Browser user who looks at her
logs to see these notices and wonder if they're dangerous.
Resolves bug 13124; bugfix on 0.2.5.3-alpha.
2014-09-11 08:02:37 -04:00
Nick Mathewson
3c2c6a6116
In routerlist_assert_ok(), check r2 before taking &(r2->cache_info)
...
Technically, we're not allowed to take the address of a member can't
exist relative to the null pointer. That makes me wonder how any sane
compliant system implements the offsetof macro, but let's let sleeping
balrogs lie.
Fixes 13096; patch on 0.1.1.9-alpha; patch from "teor", who was using
clang -fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv
2014-09-10 23:48:11 -04:00
Nick Mathewson
a9b2e5eac6
Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
2014-09-10 22:12:47 -04:00
Nick Mathewson
8eed82b3d4
Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
2014-09-09 11:04:54 -04:00
Nick Mathewson
dd22ab519a
Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5
2014-09-09 10:51:39 -04:00
Nick Mathewson
8391c96091
Clean up the MVSC nmake files so they work again.
...
Fixes bug 13081; bugfix on 0.2.5.1-alpha. Patch from "NewEraCracker."
2014-09-09 10:27:05 -04:00
Nick Mathewson
a3c49ca79a
Add more escaped() calls in directory.c
...
Patch from teor to fix 13071.
2014-09-09 10:22:01 -04:00
Nick Mathewson
d229025fef
Expand the event_mask field in controller conns to 64 bits
...
Back in 078d6bcd
, we added an event number 0x20, but we didn't make
the event_mask field big enough to compensate.
Patch by "teor". Fixes 13085; bugfix on 0.2.5.1-alpha.
2014-09-08 15:16:02 -04:00
Nick Mathewson
f551a053e3
Add cscope generated files to .gitignore.
...
Closes #13092 ; patch from dgoulet.
2014-09-08 15:07:54 -04:00
Andrea Shepard
39a017809b
Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160
2014-09-05 11:12:08 -07:00
rl1987
dcb4ee5b83
Documenting reject6 and accept6 ExitPolicy entries in manpage.
2014-09-02 18:58:00 -04:00
Nick Mathewson
efcab43956
Fix a number of clang analyzer false-positives
...
Most of these are in somewhat non-obvious code where it is probably
a good idea to initialize variables and add extra assertions anyway.
Closes 13036. Patches from "teor".
2014-09-02 11:56:56 -04:00
rl1987
8139db3725
Adding changes file.
2014-09-01 16:22:52 -04:00
Nick Mathewson
41058dce95
Merge remote-tracking branch 'arma/bug12996b' into maint-0.2.5
2014-08-29 16:44:50 -04:00
Roger Dingledine
7a878c192f
Downgrade "Unexpected onionskin length after decryption" warning
...
It's now a protocol-warn, since there's nothing relay operators can
do about a client that sends them a malformed create cell.
Resolves bug 12996; bugfix on 0.0.6rc1.
2014-08-29 16:38:54 -04:00
Nick Mathewson
4a6f5bb2dd
Improve "Tried to establish rendezvous on non-OR or non-edge circuit"
...
Instead of putting it all in one warning message, log what exactly
was wrong with the circuit.
Resolves ticket 12997.
2014-08-29 16:05:58 -04:00