Nick Mathewson
df4c484021
Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4
2015-01-23 08:52:35 -05:00
Nick Mathewson
dbd5a9a8f9
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-01-23 08:52:20 -05:00
Karsten Loesing
a9ce0cd659
Update geoip6 to the January 7 2015 database.
2015-01-22 09:58:29 +01:00
Karsten Loesing
c3f8f5ab0e
Update geoip to the January 7 2015 database.
2015-01-22 09:56:54 +01:00
Nick Mathewson
ceb6dee465
Increase limit for status vote download size by a factor of 5.
...
We've started to hit the limit here. We introduced the limit in
0.1.2.5-alpha. This fixes bug 14261, but we should have a smarter way
to not actually do the behavior this permits. See #14267 for a ticket
about fixing that.
2015-01-18 15:25:29 -05:00
Nick Mathewson
ba17cdfb0a
fix another mingw64 unit test warnin
2015-01-16 11:49:58 -05:00
Nick Mathewson
2329d9fe37
Fix a compilation warning in the unit tests
2015-01-15 12:56:57 -05:00
Nick Mathewson
746bb55851
Ignore warning for redundant decl in openssl/srtp.h
...
Backports some commits from tor master.
2015-01-15 12:38:08 -05:00
Nick Mathewson
f2fb85f970
Remove needless strdup in addressmap_register_virtual_address()
...
Fixes bug 14195. Bugfix on 0.1.0.1-rc.
2015-01-13 12:24:42 -05:00
Nick Mathewson
c9dd2d1a6a
Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.5
2015-01-12 00:59:29 -05:00
teor
b08cfc65a7
Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value
...
Check for a missing option value in parse_virtual_addr_network
before asserting on the NULL in tor_addr_parse_mask_ports.
This avoids crashing on torrc lines like Vi[rtualAddrNetworkIPv[4|6]]
when no value follows the option.
Bugfix on 0.2.3 (de4cc126cbfixes #14142 .
2015-01-11 11:05:00 -05:00
Nick Mathewson
905287415b
Avoid attempts to double-remove edge connections from the DNS resolver.
...
Also, avoid crashing when we attempt to double-remove an edge
connection from the DNS resolver: just log a bug warning instead.
Fixes bug 14129. Bugfix on 0d20fee2fb
2015-01-08 11:00:21 -05:00
Sebastian Hahn
2b9d48791d
Enlarge the buffer for a line in a bw file
2015-01-07 12:44:16 +01:00
Nick Mathewson
184a2dbbdd
whoops; missing changes file for 14013
2014-12-23 10:55:25 -05:00
Nick Mathewson
6d728ba880
Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5
2014-12-22 15:58:49 -05:00
Nick Mathewson
47760c7ba5
When decoding a base-{16,32,64} value, clear the target buffer first
...
This is a good idea in case the caller stupidly doesn't check the
return value from baseX_decode(), and as a workaround for the
current inconsistent API of base16_decode.
Prevents any fallout from bug 14013.
2014-12-22 12:56:35 -05:00
Nick Mathewson
6830667d58
Increase bandwidth usage report interval to 4 hours.
2014-12-22 12:24:13 -05:00
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
