Nick Mathewson
d995dc8bac
Split the routerset code out of routerlist.c
2012-09-14 10:20:00 -04:00
Nick Mathewson
286e95f0a5
Merge branch 'bug6833'
2012-09-14 10:10:23 -04:00
Nick Mathewson
68caa834f4
document why we only allow 64 flags in votes
2012-09-14 10:10:16 -04:00
Nick Mathewson
e4ce8cd969
Fix compilation with older gccs
...
They don't like to have #preprocessor directives inside macro arguments.
Fixes #6842 ; fix on 0.2.4.2-alpha.
Found by grarpamp.
2012-09-14 10:06:00 -04:00
Nick Mathewson
56bd3dd87f
Remove a duplicate test in test_util_pow2
2012-09-14 10:00:47 -04:00
Nick Mathewson
6492a75b9f
Merge branch 'bug6831_v2'
2012-09-14 09:54:08 -04:00
Nick Mathewson
37953497d8
Don't compute ((uint64_t)1)<<64 in round_to_power_of_2
...
This would be undefined behavior if it happened. (It can't actually
happen as we're using round_to_power_of_2, since we would have to
be trying to allocate exabytes of data.)
While we're at it, fix the behavior of round_to_power_of_2(0),
and document the function better.
Fix for bug 6831.
2012-09-14 09:51:24 -04:00
Roger Dingledine
9ab3b332ae
Merge branch 'maint-0.2.3'
2012-09-14 02:41:13 -04:00
Robert Ransom
909691f1ae
Fix man page typo
2012-09-13 23:25:03 -07:00
Nick Mathewson
abbde7b184
Merge branch 'confparse_refactor_squashed'
2012-09-13 12:25:45 -04:00
Nick Mathewson
7d11952bf4
Split the or_state_t portions of config.c into their own file
2012-09-13 12:20:26 -04:00
Nick Mathewson
2eb2536c0a
Remove all remaining spurious or_options_t invocations in confparse.c
2012-09-13 12:20:25 -04:00
Nick Mathewson
7627b2c187
Split the generic config_fmt_t code into a new confparse.c file
...
This helps us split up one of our larger files, and sets the stage
for refactoring the configuration backend a little
2012-09-13 12:20:25 -04:00
Nick Mathewson
c8b98ba41c
Reject votes (not consensuses) with >64 known-flags
...
Our flag voting code needs to handle unrecognized flags, so it stores
them in a 64-bit bitfield. But we never actually checked for too many
flags, so we were potentially doing stuff like U64_LITERAL(1)<<flagnum
with flagnum >= 64. That's undefined behavior.
Fix for bug 6833; bugfix on 0.2.0.1-alpha.
2012-09-13 11:45:05 -04:00
Nick Mathewson
582f2187a7
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-13 10:08:51 -04:00
Nick Mathewson
1e68c213a2
mention the bug number in the 6827 changes file
2012-09-13 10:07:06 -04:00
Robert Ransom
0a6480cdd0
Avoid undefined behaviour when parsing HS protocol versions
...
Fixes bug 6827; bugfix on c58675ca72
(when the v2 HS desc parser was implemented).
Found by asn.
2012-09-13 07:48:21 -04:00
Nick Mathewson
be68c1fb43
Log a notice if we're running with OpenSSL before 1.0.0.
...
These versions have some dubious, slow crypto implementations; 1.0.0
is a great improvement, and at this point is pretty mature.
2012-09-12 19:32:24 -04:00
Nick Mathewson
feabf4148f
Drop support for openssl 0.9.7
...
097 hasn't seen a new version since 2007; we can drop support too.
This lets us remove our built-in sha256 implementation, and some
checks for old bugs.
2012-09-12 19:25:58 -04:00
Nick Mathewson
a73dec16c5
Merge branch 'bug6815'
2012-09-12 16:28:59 -04:00
Nick Mathewson
19136f6f11
Fix a wide line
2012-09-12 16:28:46 -04:00
Nick Mathewson
79b31dd4f8
Merge remote-tracking branch 'origin/maint-0.2.3'
...
Use the "ours" strategy so that we retain 4aff97cfc7
, which maint-0.2.3
just reverted.
2012-09-12 15:38:33 -04:00
Nick Mathewson
45439bfced
Revert "6819: typo in torrc.sample.in"
...
This reverts commit 4aff97cfc7
.
We don't actually want to be changing the torrc.sample on stable or
near-stable stuff, since doing so makes pointless busywork for debian
users.
2012-09-12 15:37:47 -04:00
Nick Mathewson
35e19b9498
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-12 11:11:16 -04:00
Nick Mathewson
1f5a7917f5
Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3
2012-09-12 11:10:59 -04:00
Nick Mathewson
6a8861574b
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-12 11:09:10 -04:00
Nick Mathewson
4aff97cfc7
6819: typo in torrc.sample.in
2012-09-12 11:08:30 -04:00
Nick Mathewson
5cbeb60805
Fix directory self-testing logic
...
When I removed version_supports_begindir, I accidentally removed the
mechanism we had been using to make a directory cache self-test its
directory port. This caused bug 6815, which caused 6814 (both in
0.2.4.2-alpha).
To fix this bug, I'm replacing the "anonymized_connection" argument to
directory_initiate_command_* with an enumeration to say how indirectly
to connect to a directory server. (I don't want to reinstate the
"version_supports_begindir" argument as "begindir_ok" or anything --
these functions already take too many arguments.)
For safety, I made sure that passing 0 and 1 for 'indirection' gives
the same result as you would have gotten before -- just in case I
missed any 0s or 1s.
2012-09-12 10:26:59 -04:00
Roger Dingledine
5977da6c60
hot: we fixed incancations to be intancations.
2012-09-12 02:51:33 -04:00
Nick Mathewson
75c9ccd4f8
Merge remote-tracking branch 'public/bug6538'
...
Conflicts:
configure.ac
2012-09-11 17:51:36 -04:00
Roger Dingledine
b8f93c5dd7
put all the changelogs into master
2012-09-11 14:36:54 -04:00
Nick Mathewson
f8a665c87d
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-11 13:21:20 -04:00
Nick Mathewson
5833861f62
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
...
Conflicts:
src/test/test_util.c
2012-09-11 13:20:15 -04:00
Nick Mathewson
84f47ffc46
Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2
2012-09-11 13:14:43 -04:00
Nick Mathewson
973c18bf0e
Fix assertion failure in tor_timegm.
...
Fixes bug 6811.
2012-09-11 13:13:07 -04:00
Nick Mathewson
99cb9696ac
Bump version to 0.2.4.2-alpha-dev
2012-09-10 19:49:20 -04:00
Roger Dingledine
77d17a3607
fold in another
2012-09-10 18:28:41 -04:00
Roger Dingledine
d85b563dbb
Merge branch 'maint-0.2.3'
2012-09-10 18:25:57 -04:00
Roger Dingledine
19b2126119
give 0.2.4.2-alpha a blurb
2012-09-10 18:04:23 -04:00
Roger Dingledine
73c13baa97
bump to 0.2.4.2-alpha
2012-09-10 17:38:50 -04:00
Roger Dingledine
f949f61569
fold in recent changes files
2012-09-10 17:36:36 -04:00
Nick Mathewson
bf71866da0
Merge branch 'remove_old_ver_checks'
2012-09-10 15:37:13 -04:00
Nick Mathewson
4319f99828
Merge remote-tracking branch 'public/ticket6789'
2012-09-10 15:31:04 -04:00
Nick Mathewson
7ff5c3f232
Downgrade "EVP ctr128 is ok" message to info
...
Part of 6736 effort to try to make startup quieter.
2012-09-10 10:38:22 -04:00
Nick Mathewson
8731a4e148
Avoid segfault when reading state file from ancient tor
...
If s_values is null in rep_hist_load_bwhist_state_section, we would
call smartlist_len() on it, and die.
Fixes bug 6801.
2012-09-10 10:35:18 -04:00
Nick Mathewson
cb8f64cdc8
Fix tab introduced in f43946829c
2012-09-10 10:22:40 -04:00
Nick Mathewson
3e8058f9ed
Be more clear in changes file for 6797.
2012-09-10 10:21:46 -04:00
Nick Mathewson
0ab7716b9e
Merge remote-tracking branch 'linus/bug6797'
2012-09-10 10:19:57 -04:00
Nick Mathewson
344bb1d64c
Merge branch 'bug3155'
2012-09-10 10:09:29 -04:00
Nick Mathewson
20e0e7d9d1
Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155
2012-09-10 10:09:19 -04:00