6492a75b9f
Merge branch 'bug6831_v2'
2012-09-14 09:54:08 -04:00
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
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
582f2187a7
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-13 10:08:51 -04:00
1e68c213a2
mention the bug number in the 6827 changes file
2012-09-13 10:07:06 -04:00
0a6480cdd0
Avoid undefined behaviour when parsing HS protocol versions
...
Fixes bug 6827; bugfix on c58675ca72
2012-09-13 07:48:21 -04:00
a73dec16c5
Merge branch 'bug6815'
2012-09-12 16:28:59 -04:00
45439bfced
Revert "6819: typo in torrc.sample.in"
...
This reverts commit 4aff97cfc7
2012-09-12 15:37:47 -04:00
35e19b9498
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-12 11:11:16 -04:00
1f5a7917f5
Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3
2012-09-12 11:10:59 -04:00
6a8861574b
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-12 11:09:10 -04:00
4aff97cfc7
6819: typo in torrc.sample.in
2012-09-12 11:08:30 -04:00
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
75c9ccd4f8
Merge remote-tracking branch 'public/bug6538'
...
Conflicts:
configure.ac
2012-09-11 17:51:36 -04:00
f8a665c87d
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-11 13:21:20 -04:00
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
973c18bf0e
Fix assertion failure in tor_timegm.
...
Fixes bug 6811.
2012-09-11 13:13:07 -04:00
77d17a3607
fold in another
2012-09-10 18:28:41 -04:00
d85b563dbb
Merge branch 'maint-0.2.3'
2012-09-10 18:25:57 -04:00
f949f61569
fold in recent changes files
2012-09-10 17:36:36 -04:00
bf71866da0
Merge branch 'remove_old_ver_checks'
2012-09-10 15:37:13 -04:00
4319f99828
Merge remote-tracking branch 'public/ticket6789'
2012-09-10 15:31:04 -04:00
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
3e8058f9ed
Be more clear in changes file for 6797.
2012-09-10 10:21:46 -04:00
0ab7716b9e
Merge remote-tracking branch 'linus/bug6797'
2012-09-10 10:19:57 -04:00
20e0e7d9d1
Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155
2012-09-10 10:09:19 -04:00
38f3f3baf9
bug3155 changes file
2012-09-10 10:04:30 -04:00
e1e34ee4e4
raise bandwidthrate/bandwidthburst to a new "infinite"
...
addresses bug 6605.
2012-09-10 03:03:06 -04:00
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
7988596f66
Remove version_supports checks for versions before 0.2.2.
2012-09-07 23:21:18 -04:00
26cee96911
Dirservers no longer accept tors released before December 2011.
...
Implements ticket 6789.
2012-09-07 11:15:23 -04:00
1ca9e2685f
Merge branch 'quiet_lib_versions_squashed'
2012-09-06 11:32:09 -04:00
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
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
ad1e8b45df
Merge branch 'bug6778'
2012-09-06 11:05:16 -04:00
30fe9080e7
Fix a dependency: micro-revision.i influences tor_main.o, not tor_main.c
2012-09-06 11:00:32 -04:00
e9684405ac
Merge remote-tracking branch 'asn/bug4567_rebased'
2012-09-06 10:12:28 -04:00
5d162d5a7b
Fix a dependency: sha256.c influences crypto.o, not crypto.c
2012-09-06 10:03:06 -04:00
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
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
325f33047a
and fold it into master too
2012-09-05 17:23:08 -04:00
f8c1ab7bbf
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-05 16:25:13 -04:00
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
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
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
de6a538b9c
one more already-merged changes file
2012-09-04 20:23:46 -04:00
031da8dd34
remove the changes files that are merged into 0.2.3.21-rc
2012-09-04 20:11:19 -04:00
4d87919ba6
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-04 18:34:39 -04:00
d7a646edcf
Merge branch 'bug5535_only_rebased'
2012-09-04 18:24:20 -04:00
e04e1a2e7d
Clients connect to public relays over IPv6.
...
Add ClientUseIPv6 and ClientPreferIPv6ORPort configuration options.
Use "preferred OR port" for all entry nodes, not only for bridges.
Mark bridges with "prefer IPv6 OR port" if an IPv6 address is
configured in Bridge line and ClientPreferIPv6ORPort is set.
Mark relays with "prefer IPv6 OR port" if an IPv6 address is found in
descriptor and ClientPreferIPv6ORPort is set.
Filter "preferred OR port" through the ClientUseIPv6 config option. We
might want to move this test to where actual connection is being set
up once we have a fall back mechanism in place.
Have only non-servers pick an IPv6 address for the first hop: We
don't want relays to connect over IPv6 yet. (IPv6 has never been used
for second or third hops.)
Implements ticket 5535.
2012-09-04 12:57:21 -04:00
Nick Mathewson
Robert Ransom
Roger Dingledine
Linus Nordberg
George Kadianakis