Nick Mathewson
286e95f0a5
Merge branch 'bug6833'
2012-09-14 10:10:23 -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
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
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
2012-09-13 07:48:21 -04:00
Nick Mathewson
a73dec16c5
Merge branch 'bug6815'
2012-09-12 16:28:59 -04:00
Nick Mathewson
45439bfced
Revert "6819: typo in torrc.sample.in"
...
This reverts commit 4aff97cfc7
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
Nick Mathewson
75c9ccd4f8
Merge remote-tracking branch 'public/bug6538'
...
Conflicts:
configure.ac
2012-09-11 17:51:36 -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
973c18bf0e
Fix assertion failure in tor_timegm.
...
Fixes bug 6811.
2012-09-11 13:13:07 -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
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
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
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
20e0e7d9d1
Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155
2012-09-10 10:09:19 -04:00
Nick Mathewson
38f3f3baf9
bug3155 changes file
2012-09-10 10:04:30 -04:00
Roger Dingledine
e1e34ee4e4
raise bandwidthrate/bandwidthburst to a new "infinite"
...
addresses bug 6605.
2012-09-10 03:03:06 -04:00
Linus Nordberg
93ee62297f
Don't follow the NULL pointer.
...
If dirvote_create_microdescriptor() returns NULL, don't use md.
Found by "f. tp.".
Fixes bug 6797.
2012-09-10 00:43:48 +02:00
Nick Mathewson
7988596f66
Remove version_supports checks for versions before 0.2.2.
2012-09-07 23:21:18 -04:00
Nick Mathewson
26cee96911
Dirservers no longer accept tors released before December 2011.
...
Implements ticket 6789.
2012-09-07 11:15:23 -04:00
Nick Mathewson
1ca9e2685f
Merge branch 'quiet_lib_versions_squashed'
2012-09-06 11:32:09 -04:00
Nick Mathewson
7607ad2bec
Detect openssl header version doesn't match runtime version
...
We already do this for libevent; let's do it for openssl too.
For now, I'm making it always a warn, since this has caused some
problems in the past. Later, we can see about making it less severe.
2012-09-06 11:31:30 -04:00
Nick Mathewson
e3a130a7eb
Don't log about Libevent/OpenSSL initialization when all's well
...
OTOH, log the Libevent and OpenSSL versions on the first line when
we're starting Tor.
2012-09-06 11:31:22 -04:00
Nick Mathewson
ad1e8b45df
Merge branch 'bug6778'
2012-09-06 11:05:16 -04:00
Nick Mathewson
30fe9080e7
Fix a dependency: micro-revision.i influences tor_main.o, not tor_main.c
2012-09-06 11:00:32 -04:00
Nick Mathewson
e9684405ac
Merge remote-tracking branch 'asn/bug4567_rebased'
2012-09-06 10:12:28 -04:00
Nick Mathewson
5d162d5a7b
Fix a dependency: sha256.c influences crypto.o, not crypto.c
2012-09-06 10:03:06 -04:00
Nick Mathewson
91fed2c703
Fix a build-warning when building out-of-tree
...
We were trying to incorporate all headers in common_sha1.i, not just
the src/common ones.
This is part of bug 6778; fix on 0.2.4.1-alpha
2012-09-06 09:56:48 -04:00
Nick Mathewson
5d679caa32
Fix warning when implicitly casting strlen(microdesc) to int
...
Harmless unless we somehow generate a microdesc of more than INT_MAX
bytes.
2012-09-05 20:49:25 -04:00
Roger Dingledine
325f33047a
and fold it into master too
2012-09-05 17:23:08 -04:00
Nick Mathewson
f8c1ab7bbf
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-05 16:25:13 -04:00
Nick Mathewson
9d9ca264ec
Avoid segfault if EntryGuardPathBias precedes EntryGuard
...
Fix for bug 6774; bugfix on 0.2.3.17-beta.
2012-09-05 13:27:54 -04:00
George Kadianakis
44fe717524
General tweaks and fixes for Nick's comments.
...
* Add changes/ files.
* Edit the tor-fw-helper manpage.
* Fix check-spaces.
* Add prototype for get_list_of_ports_to_forward().
* Fix tor_parse_long() TCP port range.
* Improve doc. of tor_check_port_forwarding().
* Check for overflows in tor_check_port_forwarding().
* Demote successful port forwarding to LOG_INFO.
Conflicts:
src/common/address.c
src/or/circuitbuild.c
2012-09-05 18:23:28 +03:00
Roger Dingledine
c77d1b7bda
fold in the changes files
...
in-progress due to various bugs i uncovered in the ipv6 config option
meanings.
2012-09-05 04:46:44 -04:00
Roger Dingledine
de6a538b9c
one more already-merged changes file
2012-09-04 20:23:46 -04:00
Roger Dingledine
031da8dd34
remove the changes files that are merged into 0.2.3.21-rc
2012-09-04 20:11:19 -04:00
