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
339a47e80b
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-15 00:03:29 -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
Nick Mathewson
ac5ae794bd
tristate->enum in rendcommon functions
...
When we have more than two return values, we should really be using
an enum rather than "-2 means this, -1 means that, 0 means this, and
1 or more means a number."
2014-02-14 23:23:53 -05:00
Nick Mathewson
1987894626
fix a whitespace snafu
2014-02-14 23:00:04 -05:00
Karsten Loesing
c024ff8671
Remove another unused v0 hidserv function.
...
Noted by Nick on #10841 .
2014-02-14 17:54:16 +01:00
Karsten Loesing
f6f691df73
Update geoip6 to the February 2014 GeoIP database.
2014-02-13 19:04:51 +01:00
Karsten Loesing
436f7106b4
Exclude Teredo IPv6 prefix from geoip6.
...
The latest GeoLite2 database includes a pointer from 2001::/32 to the root
node of the IPv4 address space in the tree. We need to exclude this whole
address space from geoip6, similar to how we exclude IPv4-mapped IPv6
addresses and the 6to4 mapping subnet.
2014-02-13 18:58:21 +01:00
Roger Dingledine
745434d29a
bump to 0.2.5.2-alpha
2014-02-13 04:06:36 -05:00
Roger Dingledine
f63b394d90
give 0.2.5.2-alpha a release blurb
2014-02-13 03:49:46 -05:00
Roger Dingledine
8028d8fded
fold in the changes files to the new 0.2.5.2-alpha changelog
2014-02-13 02:46:26 -05:00
Nick Mathewson
24add404ac
eventdns.c: survive broken resolv.conf files
...
If you had a resolv.conf file with a nameserver line containing no
nameserver IP, we would crash. That's not terrible, but it's not
desirable.
Fixes bug 8788; bugfix on 0.1.1.23. Libevent already has this fix.
2014-02-12 15:11:31 -05:00
Nick Mathewson
79c234e0e3
On OOM, also log N circuits remaining
2014-02-12 13:09:02 -05:00
Nick Mathewson
c8d41da52d
More unit tests for OOM handling.
...
This gets us up to no interesting untested new or changed lines for
the 10169 code.
2014-02-12 12:50:16 -05:00
Nick Mathewson
48877e24a8
Initial unit tests for OOM handling
2014-02-12 12:49:56 -05:00
Nick Mathewson
9a07ec751f
Refactor OOM-handling functions for more testability
...
This patch splits out some of the functions in OOM handling so that
it's easier to check them without involving the rest of Tor or
requiring that the circuits be "wired up".
2014-02-12 12:48:20 -05:00
Nick Mathewson
52d222aafb
Add tests for buffer time tracking.
2014-02-12 12:48:11 -05:00
Nick Mathewson
d379fc6e0f
Several tests for buffer allocation
2014-02-12 12:48:00 -05:00
Nick Mathewson
f425cf8338
Start writing tests for 10169.
...
Now we cover more chunk allocation functions.
2014-02-12 12:47:49 -05:00
Nick Mathewson
eb6f433bdb
Debugging code inbuffers.c for debugging chunk allocation.
...
Currently on; will disable later in this branch.
2014-02-12 12:46:17 -05:00
Nick Mathewson
87fb1e324c
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2
...
Conflicts:
src/or/circuitlist.c
2014-02-12 12:44:58 -05:00
Nick Mathewson
05d8111eed
Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
2014-02-12 12:39:15 -05:00
Nick Mathewson
fd28754dd3
Actually release buffer freelists when handling OOM conditions.
...
Otherwise freeing buffers won't help for a little while.
2014-02-12 12:38:20 -05:00
Nick Mathewson
7951591744
Fix bugs in bug10169 bugfix memory tracking
...
The chunk_grow() and chunk_copy() functions weren't adjusting the
memory totals properly.
Bugfix not on any released Tor version.
2014-02-12 12:37:41 -05:00
Nick Mathewson
10d1b0b33e
Changes file for feature4900
2014-02-12 12:20:29 -05:00
Nick Mathewson
c1e98c8afe
Randomize the global siphash key at startup
...
This completes our conversion to using siphash for our hash functions.
2014-02-12 12:12:58 -05:00
Nick Mathewson
d3fb846d8c
Split crypto_global_init() into pre/post config
...
It's increasingly apparent that we want to make sure we initialize our
PRNG nice and early, or else OpenSSL will do it for us. (OpenSSL
doesn't do _too_ bad a job, but it's nice to do it ourselves.)
We'll also need this for making sure we initialize the siphash key
before we do any hashes.
2014-02-12 12:04:07 -05:00
Nick Mathewson
0e97c8e23e
Siphash-2-4 is now our hash in nearly all cases.
...
I've made an exception for cases where I'm sure that users can't
influence the inputs. This is likely to cause a slowdown somewhere,
but it's safer to siphash everything and *then* look for cases to
optimize.
This patch doesn't actually get us any _benefit_ from siphash yet,
since we don't really randomize the key at any point.
2014-02-12 11:32:10 -05:00
Nick Mathewson
f05820531a
csiphash: Add functions to take a global key.
2014-02-12 11:27:41 -05:00
Nick Mathewson
f51df9bb93
Tests for siphash, from reference implementation.
2014-02-12 10:58:03 -05:00
Nick Mathewson
1bd86b69b6
csiphash: avoid unaligned access on non-x86
2014-02-12 10:57:46 -05:00
Nick Mathewson
9605978eb6
Get csiphash better integrated with our build system
2014-02-12 10:24:04 -05:00
Nick Mathewson
f4656c0cc9
Raw import of Marek Majkowski's cisphash.c
...
siphash is a hash function designed for producing hard-to-predict
64-bit outputs from short inputs and a 128-bit key. It's chosen for
security and speed.
See https://131002.net/siphash/ for more information on siphash.
Source: https://github.com/majek/csiphash/
2014-02-12 10:09:45 -05:00
Nick Mathewson
2c0088b8aa
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-12 09:17:11 -05: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
2014-02-12 09:16:22 -05:00
Karsten Loesing
74c2bff781
Remove remaining v0 hidden service descriptor code.
...
Fixes the rest of #10841 after #10881 already removed some hidden service
authority code.
2014-02-12 14:36:08 +01:00
Roger Dingledine
1ccc282122
add a missing word to the man page
2014-02-12 04:01:59 -05:00
Roger Dingledine
7c39bf0e44
go through and rewrite the changes files to be more user-facing
2014-02-12 03:59:59 -05:00
Nick Mathewson
0ee449ca92
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-11 18:58:58 -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
c3720c05fa
Free leakable values in the unit tests.
...
Thanks, Coverity! (CID 1171414, 1171415, 1171416)
2014-02-11 18:10:33 -05:00
Nick Mathewson
10d4d3e2d5
Merge remote-tracking branch 'public/no_itime_queue_025'
2014-02-11 11:52:35 -05:00
Nick Mathewson
5e0cdc5ef2
Merge branch 'bug10881'
2014-02-11 11:42:06 -05:00
Nick Mathewson
0228b9bd4b
Tweak DirAuthority documentation
...
Per a comment from karsten, there is no longer v2 authority support,
so stop pretending there is. Also, fix a grammar error.x
2014-02-11 11:34:32 -05:00
Nick Mathewson
cb065a55bd
Merge remote-tracking branch 'karsten/one-dirauth'
2014-02-11 10:15:03 -05:00
