Nick Mathewson
e0b7598833
Repair breakage in early-error case of microdesc parsing
...
When I fixed #11243 , I made it so we would take the digest of a
descriptor before tokenizing it, so we could desist from download
attempts if parsing failed. But when I did that, I didn't remove an
assertion that the descriptor began with "onion-key". Usually, this
was enforced by "find_start_of_next_microdescriptor", but when
find_start_of_next_microdescriptor returned NULL, the assertion was
triggered.
Fixes bug 16400. Thanks to torkeln for reporting and
cypherpunks_backup for diagnosing and writing the first fix here.
2015-06-22 13:51:56 -04:00
Nick Mathewson
583a387c1e
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-06-18 11:33:24 -04:00
Nick Mathewson
f18ee7fc72
Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6
2015-06-18 11:30:01 -04:00
Nick Mathewson
be32777aa5
changes file for 13642
2015-06-17 10:51:39 -04:00
David Goulet
a5b5d4bd2e
Extend intro point to a 4th hop on cannibalization
...
Fixes #16260
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-06-17 09:32:26 -04:00
Nick Mathewson
43a98c7da6
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-06-17 09:19:11 -04:00
Nick Mathewson
c8cb55659a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-06-17 09:18:45 -04:00
teor
75388f67c0
Correctly handle failed crypto_early_init
...
If crypto_early_init fails, a typo in a return value from tor_init
means that tor_main continues running, rather than returning
an error value.
Fixes bug 16360; bugfix on d3fb846d8c
in 0.2.5.2-alpha,
introduced when implementing #4900 .
Patch by "teor".
2015-06-17 09:18:32 -04:00
David Goulet
8acf5255c2
Revert "Do not replace a HS descriptor with a different replica of itself"
...
This reverts commit 9407040c59
.
Small fix, "e->received" had to be removed since that variable doesn't exist
anymore.
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-06-16 13:41:42 -04:00
Nick Mathewson
130a9c0ac8
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-06-15 10:19:46 -04:00
Nick Mathewson
59fa0c2d99
Fix another seccomp2 issue
...
Allow pipe() and pipe2() syscalls; we need these when eventfd2()
support is missing. Fixes bug 16363; bugfix on 0.2.6.3-alpha. Patch
from "teor".
2015-06-15 10:13:11 -04:00
Karsten Loesing
08e14e1448
Update geoip6 to the June 3 2015 database.
2015-06-09 16:28:48 +02:00
Karsten Loesing
e5907e94c2
Update geoip to the June 3 2015 database.
2015-06-09 16:26:10 +02:00
Nick Mathewson
64bdf040f0
Merge remote-tracking branch 'teor/feature15817-clang-sanitizers'
2015-06-08 10:57:25 -04:00
Nick Mathewson
c0c0a6085e
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-06-08 10:33:38 -04:00
David Goulet
6785f0b65a
HSDir flag now requires the Stable flag
...
Fixes #8243
2015-06-08 10:28:35 -04:00
teor
bc0a9843e5
Add instructions for clang sanitizers, static analyzer, and coverity
...
Document use of coverity, clang static analyzer, and clang dynamic
undefined behavior and address sanitizers in doc/HACKING.
Add clang dynamic sanitizer blacklist in
contrib/clang/sanitizer_blacklist.txt to exempt known undefined
behavior. Include detailed usage instructions in this blacklist file.
Patch by "teor".
2015-06-06 04:04:23 +10:00
Nick Mathewson
2f67a6e8c9
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-06-04 15:02:47 -04:00
Yawning Angel
f2ff814582
Set session_group after the port's data structure has been populated.
...
Fixes #16247 , patch by "jojelino".
2015-06-04 13:53:35 +00:00
Nick Mathewson
34edf17d88
Merge remote-tracking branch 'teor/bug16115-minor-fixes'
2015-06-02 14:51:13 -04:00
Nick Mathewson
e8386cce1c
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-06-02 14:29:37 -04:00
Peter Palfrader
a68e5323f8
Fix sandboxing to work when running as a relay
...
This includes correctly allowing renaming secret_id_key and allowing the
eventfd2 and futex syscalls. Fixes bug 16244; bugfix on 0.2.6.1-alpha.
2015-06-02 14:20:01 -04:00
teor
6d8a2ff24f
Check for NULL values in getinfo_helper_onions
...
Fix on 915c7438a7
in Tor 0.2.7.1-alpha.
2015-06-03 04:19:06 +10:00
teor
383a27afc5
Ensure signing_key is non-NULL before accessing one of its members
...
signing_key can be NULL in ed_key_init_from_file in routerkeys.c.
Discovered by clang 3.7 address sanitizer.
Fix on c03694938e
, not in any released version of Tor.
2015-06-03 04:19:05 +10:00
teor
e0477de0e2
Remove undefined directive-in-macro in test_util_writepid
...
clang 3.7 complains that using a preprocessor directive inside
a macro invocation in test_util_writepid in test_util.c is undefined.
Fix on 79e85313aa
on 0.2.7.1-alpha.
2015-06-03 04:19:05 +10:00
teor
2b73dbf2a4
Always initialise return value in compute_desc_id in rendcommon.c
...
Fix on e6a581f126
, released in 0.2.7.1-alpha.
2015-06-03 04:19:05 +10:00
teor
b3f79da0d5
Silence unused variable warnings in find_cipher_by_id
...
Unused variable warnings were still generated under some versions of OpenSSL.
Instead, make sure all variables are used under all versions.
Fix on 496df21c89
, not in any released version of tor.
2015-06-03 04:19:05 +10:00
teor
b1094fdec5
Fix an incorrect comment on spawn_func
...
spawn_func calls pthread_create on unix, not fork
Fix on existing code split out of compat.c into
compat_pthreads.c in c2f0d52b7f
2015-06-03 04:18:43 +10:00
Nick Mathewson
b66f4cfc9d
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-05-28 14:06:01 -04:00
Nick Mathewson
97330ced0c
Fix sandbox use with systemd. bug 16212.
2015-05-28 14:05:46 -04:00
Nick Mathewson
5dce1829bf
Avoid double-free on rend_add_service() failure
...
Rend_add_service() frees its argument on failure; no need to free again.
Fixes bug 16228, bugfix on 0.2.7.1-alpha
Found by coverity; this is CID 1301387.
2015-05-28 13:23:09 -04:00
Nick Mathewson
4a9f41e1ec
Bug 12498 needs a changes file.
2015-05-28 11:40:20 -04:00
Nick Mathewson
8ca3773f68
Fix unit tests on MSVC2013.
...
Patch from "NewEraCracker." Fixes bug16030; bugfix on 0.2.6.2-alpha.
2015-05-26 10:34:07 -04:00
Nick Mathewson
115dd554c5
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-05-26 09:41:30 -04:00
Nick Mathewson
08e8c21b1f
Fix --enable-systemd builds on systems with libsystemd but not systemd
...
Fixes bug 16164; bugfix on 0.2.6.3-alpha. Patch from Peter Palfrader.
2015-05-26 09:39:53 -04:00
Nick Mathewson
45a90573e6
Merge remote-tracking branch 'yawning/ticket16140'
2015-05-21 13:20:24 -04:00
Nick Mathewson
9fee289d24
Revert the broken part of 548b4be
...
Fixes 16152.
2015-05-21 13:18:51 -04:00
Yawning Angel
452cebc4a4
Remove support for OpenSSL without ECC.
...
As OpenSSL >= 1.0.0 is now required, ECDHE is now mandatory. The group
has to be validated at runtime, because of RedHat lawyers (P224 support
is entirely missing in the OpenSSL RPM, but P256 is present and is the
default).
Resolves ticket #16140 .
2015-05-21 17:07:30 +00:00
Nick Mathewson
eb7f4d0059
Merge remote-tracking branch 'yawning/bug16052a_027'
2015-05-21 10:48:52 -04:00
Nick Mathewson
ed02a409cf
Merge branch 'bug16034_no_more_openssl_098_squashed'
...
Conflicts:
src/test/testing_common.c
2015-05-20 15:33:22 -04:00
Nick Mathewson
971f0f8e18
Remove code to support OpenSSL 0.9.8
2015-05-20 15:27:36 -04:00
Yawning Angel
db7bde08be
Add "HiddenServiceMaxStreams" as a per-HS tunable.
...
When set, this limits the maximum number of simultaneous streams per
rendezvous circuit on the server side of a HS, with further RELAY_BEGIN
cells being silently ignored.
This can be modified via "HiddenServiceMaxStreamsCloseCircuit", which
if set will cause offending rendezvous circuits to be torn down instead.
Addresses part of #16052 .
2015-05-20 17:33:59 +00:00
Nick Mathewson
2308f917f9
Merge remote-tracking branch 'andrea/ticket15358_squashed_2'
2015-05-18 14:44:28 -04:00
Andrea Shepard
79f7721a7e
Changes file for ticket 15358
2015-05-17 13:58:05 +00:00
John Brooks
6f9e90101e
Fix crash on HUP with mixed ephemeral services
...
Ephemeral services will be listed in rend_services_list at the end of
rend_config_services, so it must check whether directory is non-NULL
before comparing.
This crash happens when reloading config on a tor with mixed configured
and ephemeral services.
Fixes bug #16060 . Bugfix on 0.2.7.1-alpha.
2015-05-16 20:01:38 -06:00
David Goulet
c1ffeadff4
Add missing descriptor ID to HS_DESC control event
...
For FAILED and RECEIVED action of the HS_DESC event, we now sends back the
descriptor ID at the end like specified in the control-spec section 4.1.25.
Fixes #15881
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-05-14 10:46:38 -04:00
Nick Mathewson
614d9bc967
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-05-13 11:05:33 -04:00
Nick Mathewson
df76da0f3b
Add a .dummy file in the changes directory to stop git from removing it
2015-05-11 11:41:48 -04:00
Nick Mathewson
d417870b27
Tweak changelog more.
2015-05-11 09:42:41 -04:00
Nick Mathewson
b0ea36d779
Merge remote-tracking branch 'public/bug15821_025'
2015-05-05 15:06:57 -04:00
John Brooks
2b27ce52d2
Fix out-of-bounds read in INTRODUCE2 client auth
...
The length of auth_data from an INTRODUCE2 cell is checked when the
auth_type is recognized (1 or 2), but not for any other non-zero
auth_type. Later, auth_data is assumed to have at least
REND_DESC_COOKIE_LEN bytes, leading to a client-triggered out of bounds
read.
Fixed by checking auth_len before comparing the descriptor cookie
against known clients.
Fixes #15823 ; bugfix on 0.2.1.6-alpha.
2015-05-05 15:05:32 -04:00
Nick Mathewson
caaaea2ac9
Re-sort and flow the changelog. Add new entry
2015-05-05 11:26:17 -04:00
Donncha O'Cearbhaill
841c4aa715
Add "+HSPOST" and related "HS_DESC" event flags to the controller.
...
"+HSPOST" and the related event changes allow the uploading of HS
descriptors via the control port, and more comprehensive event
monitoring of HS descriptor upload status.
2015-05-04 11:41:28 -04:00
Nick Mathewson
ef7ef4abb4
Move changes entries into changelog for 0.2.7.1-alpha
2015-04-30 15:29:56 -04:00
Nick Mathewson
174598f3ef
Make lintChanges happy
2015-04-30 15:11:19 -04:00
Nick Mathewson
1640944948
remove changes files for already-moved things
2015-04-30 15:04:41 -04:00
Nick Mathewson
7286a27cfc
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-28 14:46:53 -04:00
David Goulet
26c344a563
Revert "Remove obsolete workaround in dirserv_thinks_router_is_hs_dir()"
...
Fixes #15850 , part of #15801 . Change file is added by this commit. The
original comment in the reverted commit is removed because right now we
*need* a DirPort until #15849 is implemented so no doubt nor confusion there
anymore.
This reverts commit 80bed1ac96
.
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-04-28 14:30:07 -04:00
Nick Mathewson
24f170a11f
Merge branch 'feature6411_v4'
2015-04-28 10:19:16 -04:00
Yawning Angel
915c7438a7
Add "ADD_ONION"/"DEL_ONION" and "GETINFO onions/*" to the controller.
...
These commands allow for the creation and management of ephemeral
Onion ("Hidden") services that are either bound to the lifetime of
the originating control connection, or optionally the lifetime of
the tor instance.
Implements #6411 .
2015-04-28 10:19:08 -04:00
Nick Mathewson
028cac97c1
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-27 14:18:31 -04:00
Nick Mathewson
0ac748353a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-27 14:18:16 -04:00
Nick Mathewson
6c7720ed49
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-27 14:16:55 -04:00
Nick Mathewson
efae1bcef6
Merge remote-tracking branch 'karsten/geoip6-apr2015' into maint-0.2.4
2015-04-27 14:15:58 -04:00
Nick Mathewson
609cdec112
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-04-27 14:15:44 -04:00
Karsten Loesing
b5f6495876
Update geoip6 to the April 8 2015 database.
2015-04-24 17:51:36 +02:00
Karsten Loesing
bcc0a48cfe
Update geoip to the April 8 2015 database.
2015-04-24 17:49:45 +02:00
Nick Mathewson
01fa3566d5
changes for 14847
2015-04-23 12:27:27 -04:00
Nick Mathewson
c366e1fa32
Merge remote-tracking branch 'public/remove_old_libevent_autoconf_stuff'
2015-04-23 10:27:01 -04:00
cypherpunks
d54b17f479
Add changes file for 15344.
2015-04-23 10:00:00 -04:00
Nick Mathewson
372aef8981
Merge remote-tracking branch 'public/bug15546'
2015-04-23 09:50:29 -04:00
Nick Mathewson
af83a205b0
Merge remote-tracking branch 'andrea/ticket14840'
2015-04-23 09:34:00 -04:00
Nick Mathewson
d48df89d19
changes file for 14845
2015-04-23 09:27:59 -04:00
Nick Mathewson
01d988d72f
Merge remote-tracking branch 'teor/bug-15642-v3-fallback-unit-tests'
2015-04-23 09:22:16 -04:00
Nick Mathewson
647b7d37c2
Merge remote-tracking branch 'public/bug15745_027_03'
2015-04-23 09:10:35 -04:00
Nick Mathewson
3acee61422
Merge branch 'feature15652_squashed'
2015-04-23 09:09:33 -04:00
Yawning Angel
196499da73
Use a custom Base64 encoder with more control over the output format.
2015-04-23 09:06:58 -04:00
Nick Mathewson
8a951ed158
Merge remote-tracking branch 'teor/bug-15771-reachability'
2015-04-23 09:04:53 -04:00
teor
d68bbb0a29
Unit tests for consider_adding_dir_servers() as modified in #15642
...
Unit tests for the 10 valid combinations of set/NULL config options
DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority,
and FallbackDir.
Add assertion in consider_adding_dir_servers() for checks in
validate_dir_servers():
"You cannot set both DirAuthority and Alternate*Authority."
2015-04-23 00:16:04 +10:00
teor
027f73f70e
Disable default fallback directories when other directories are set
...
Only add the default fallback directories when the DirAuthorities,
AlternateDirAuthority, and FallbackDir directory config options
are set to their defaults.
The default fallback directory list is currently empty, this fix will
only change tor's behaviour when it has default fallback directories.
Fixes bug 15642; bugfix on 90f6071d8d
in 0.2.4.7-alpha. Patch by "teor".
2015-04-23 00:16:04 +10:00
teor
9139aeadb8
Reachability should check ExtendAllowPrivateAddresses not TestingTorNetwork
...
When self-testing reachability, use ExtendAllowPrivateAddresses
to determine if local/private addresses imply reachability.
The previous fix used TestingTorNetwork, which implies
ExtendAllowPrivateAddresses, but this excluded rare configs where
ExtendAllowPrivateAddresses is set but TestingTorNetwork is not.
Fixes bug 15771; bugfix on 0.2.6.1-alpha, bug #13924 .
Patch by "teor", issue discovered by CJ Ess.
2015-04-22 23:54:21 +10:00
Yawning Angel
9a9ab455a3
Use correct severity in the get_if_addrs tests.
2015-04-21 16:42:07 +00:00
David Goulet
6f6881c432
Use a random count of INTRODUCE2 for IP rotation
...
An introduction point is currently rotated when the amount of INTRODUCE2
cells reached a fixed value of 16384. This makes it pretty easy for an
attacker to inflate that number and observe when the IP rotates which leaks
the popularity of the HS (amount of client that passed through the IP).
This commit makes it a random count between the current value of 16384 and
two times that.
Fixes #15745
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-04-20 17:38:31 -04:00
Andrea Shepard
6c8a186c03
Changes file for ticket 14840
2015-04-17 22:41:50 +00:00
Nick Mathewson
f152081de1
Merge remote-tracking branch 'arma/ticket8766'
2015-04-16 11:15:29 -04:00
Nick Mathewson
b98cc79477
Merge remote-tracking branch 'sebastian/bug14784'
2015-04-15 11:10:37 -04:00
Nick Mathewson
d59c4063f3
Stop modifying const argument in handle_control_postdescriptor
...
Fixes 15546.
2015-04-15 10:47:50 -04:00
Nick Mathewson
7e1fa9d63e
changes file for 14391
2015-04-15 10:34:19 -04:00
Nick Mathewson
7e6437babc
chagnes file for 15542
2015-04-15 09:40:27 -04:00
cypherpunks
59e753a4a6
Make --hash-password imply --hush to prevent unnecessary noise.
2015-04-15 09:39:41 -04:00
Yawning Angel
ba2485f7df
Remove USE_OPENSSL_BASE64
and the associated code.
...
The alternative has been available since 2007, there's no way to
actually enable the ifdef, and it breaks on well formed but not OpenSSL
style inputs.
2015-04-10 09:12:47 +00:00
Nick Mathewson
f9327848ba
Collect badness values in ntor_ref.py; don't just clobber.
...
Fixes bug 15591; patch from joelanders
2015-04-09 11:57:55 -04:00
Nick Mathewson
202bbfbaa4
Merge branch 'bug15604_squashed'
2015-04-07 15:15:54 -04:00
rl1987
fda2aa7703
Set ConnDirectionStatistics back to 0 if not running as relay.
2015-04-07 15:15:28 -04:00
Nick Mathewson
edde1a7844
Merge branch 'bug15541_squashed'
2015-04-07 14:09:55 -04:00
rl1987
e89c200c47
Print the error message for --dump-config even if no arguments are given.
2015-04-07 14:09:41 -04:00
rl1987
636495257b
Improve descriptions of statistics-related torrc options.
2015-04-07 14:04:03 -04:00
Nick Mathewson
a201a5396e
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-06 09:26:28 -04:00
Nick Mathewson
0475552140
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-06 09:26:16 -04:00
Nick Mathewson
fe69a7e1d7
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-06 09:25:37 -04:00
Nick Mathewson
7451b4cafe
Changes file for bug15601
2015-04-06 09:24:16 -04:00
Yawning Angel
49ddd92c11
Validate the RSA key size received when parsing INTRODUCE2 cells.
...
Fixes bug 15600; reported by skruffy
2015-04-06 09:18:17 -04:00
Nick Mathewson
24352d0d70
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-03 09:47:57 -04:00
George Kadianakis
929a8f199b
Decrease the amount of rend circ relaunches for hidden services.
2015-04-03 09:47:40 -04:00
Nick Mathewson
c1b36488e9
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-03 09:39:19 -04:00
Nick Mathewson
3781955f07
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-03 09:38:54 -04:00
Nick Mathewson
01e4bc80cd
Merge branch 'bug15515_024' into maint-0.2.4
2015-04-03 09:36:59 -04:00
George Kadianakis
8dba8a088d
Block multiple introductions on the same intro circuit.
2015-04-03 09:35:47 -04:00
Nick Mathewson
05fbbfe472
Merge remote-tracking branch 'public/remove_old_version_checks'
2015-04-01 14:02:02 -04:00
Nick Mathewson
d366c3354f
Merge branch 'remove_digests'
2015-04-01 13:53:03 -04:00
Nick Mathewson
cd8f13b5cb
Merge branch 'bug13736'
2015-04-01 13:46:50 -04:00
Nick Mathewson
aa7b792250
Merge remote-tracking branch 'yawning/feature15435'
2015-04-01 13:34:14 -04:00
Nick Mathewson
34fa4ad637
Merge remote-tracking branch 'public/bug15515_025'
2015-04-01 12:59:19 -04:00
George Kadianakis
a7eae4ddc5
Block multiple introductions on the same intro circuit.
2015-04-01 12:58:52 -04:00
Nick Mathewson
fec3091129
add changes file for 15296.
2015-04-01 12:52:00 -04:00
Nick Mathewson
0ddd8f06a9
Merge remote-tracking branch 'yawning/feature15471'
2015-04-01 12:47:16 -04:00
Nick Mathewson
c66dd17980
Drop support for --digests
...
This is a fair amount of maintainance burden, and doesn't help much
more than the git microversion.
Closes ticket 14742.
2015-04-01 09:54:20 -04:00
Nick Mathewson
02c3879f87
Merge remote-tracking branch 'teor/ticket15431-event-mask-tests'
2015-03-31 14:57:04 -04:00
Nick Mathewson
30e933b136
Merge branch 'ticket14710_squashed'
2015-03-31 14:37:09 -04:00
rl1987
b49ffb2a21
Changes file for 14710.
2015-03-31 14:37:03 -04:00
Yawning Angel
fa81508eb2
Use prctl() to have the kernel SIGTERM background processes on exit.
...
This uses a Linux-ism to attempt to always clean up background processes
if possible. Note that it is not a catch-all, in that executables with
suid/sgid or elevated capabilities will have the prctl() attribute
stripped as part of the execve().
Resolves ticket 15471.
2015-03-26 14:56:14 +00:00
Yawning Angel
fda61e030e
Implement "TOR_PT_EXIT_ON_STDIN_CLOSE".
...
Background processes spawned by Tor now will have a valid stdin.
Pluggable transports can detect this behavior with the aformentioned
enviornment variable, and exit if stdin ever gets closed.
2015-03-26 12:55:12 +00:00
Nick Mathewson
dde4ffeb97
Merge remote-tracking branch 'dgoulet/bug15377_027_01'
2015-03-24 16:27:27 -04:00
Nick Mathewson
9e80fc8171
Merge remote-tracking branch 'sebastian/coverage_builds'
2015-03-24 15:16:49 -04:00
Nick Mathewson
25c3ff4500
Merge remote-tracking branch 'public/bug15269'
2015-03-24 14:59:09 -04:00
Nick Mathewson
112c554fcf
Merge branch 'bug14018'
2015-03-24 14:36:23 -04:00
rl1987
09c54655f1
Complain if relative paths are used in configuration
...
When we validate torrc options, print warning(s) when relative
path(s) been found.
2015-03-24 14:35:52 -04:00
Nick Mathewson
60d147fb9e
Remove changes files for patches in 0.2.6.6 or earlier.
2015-03-24 09:38:46 -04:00
Nick Mathewson
05f7336624
Remove version checks for microdescriptor support
...
At this point, relays without microdescriptor support are no longer
allowed on the Tor network.
2015-03-24 09:25:35 -04:00
Nick Mathewson
0f31080d63
Stop checking for torrc state files generated by very old Tor versions
...
These haven't worked in so long that if you had a state file of this
kind, the guards in it would be so old that you wouldn't use them
anyway.
2015-03-24 09:24:12 -04:00
Nick Mathewson
190ed66b06
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-23 09:25:35 -04:00
Nick Mathewson
c113544a94
Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6
2015-03-23 09:25:15 -04:00
Yawning Angel
732f522a42
Fix unaligned access in SipHash-2-4.
...
The compiler is allowed to assume that a "uint64_t *" is aligned
correctly, and will inline a version of memcpy that acts as such.
Use "uint8_t *", so the compiler does the right thing.
2015-03-23 09:20:02 -04:00
teor
b41a5039f1
Compile-time check that control_event_t.event_mask is big enough
...
Add a compile-time check that the number of events doesn't exceed
the capacity of control_event_t.event_mask.
2015-03-22 14:25:42 +11:00
teor
99c10a95e4
Add unit tests for control_event_is_interesting()
...
Part of ticket 15431, checks for bugs similar to 13085.
2015-03-22 14:24:41 +11:00
Sebastian Hahn
1228dd293b
Disable assertions during coverage builds
...
This removes roughly 5000 branches in my testing. We never want to
trigger assertions even during tests, so this is sane. Implements #15400 .
2015-03-21 02:34:44 +01:00
Nick Mathewson
e82e600d6e
Here is a test for memwipe.
...
It invokes undefined behavior, I'm afraid, since there's no other
c-legal way to test whether memwipe() works when we're not allowed to
look at it.
Closes ticket 15377.
2015-03-19 18:47:24 -04:00
Nick Mathewson
54d6e5e71e
Merge remote-tracking branch 'public/feature15053'
2015-03-18 14:27:00 -04:00
Nick Mathewson
d8263ac254
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-18 08:58:15 -04:00
Nick Mathewson
efba2922ea
changes file for 15024
2015-03-15 08:26:43 -04:00
Nick Mathewson
b78803f9f5
Extract main part of main loop into a separate function
...
For 15176; Shadow would like this.
Based on a patch by Rob Jansen, but revised to have a minimal-sized diff.
2015-03-14 14:28:29 -04:00
Nick Mathewson
7bed9dc73a
Avoid double-parens in log_fn() messages on clang.
...
On clang (and elsewhere?) __PRETTY_FUNCTION__ includes parenthesized
argument lists. This is clever, but it makes our old "%s(): " format
look funny.
This is a fix on 0957ffeb
, aka svn:r288. Fixes bug 15269.
2015-03-14 14:12:03 -04:00
Nick Mathewson
feca329031
Log version when LD_BUG is logged.
...
Closes ticket 15026.
2015-03-14 13:50:23 -04:00
cypherpunks
e656a88fad
Add changes file for 15053.
2015-03-14 13:00:05 -04:00
Nick Mathewson
511ca9b91c
Remove DynamicDHGroups as obsoleted by PluggableTransports or P256.
...
Closes ticket 13736.
2015-03-14 12:40:55 -04:00
Nick Mathewson
f70f1d283e
Do not printf success messages when we are --quieted or --hushed.
...
Fixes 14994. Calling this a bug on when --quiet and --hush began to have
their current behavior.
2015-03-14 12:12:53 -04:00
Nick Mathewson
833b6d30be
Merge remote-tracking branch 'sebastian/bug15211'
2015-03-13 09:39:04 -04:00
Nick Mathewson
517e0f965b
Remove workarounds for Libevent < 1.3.
...
This actually lets us dump a lot of old cruft that nobody had (I
hope!) tested in ages.
Closes 15248.
2015-03-12 16:59:05 -04:00
Sebastian Hahn
badc81de5b
Don't init hs intro key as side effect of an assert
2015-03-12 18:59:46 +01:00
Sebastian Hahn
447769dd28
Don't init control authchallenge nonce as assert side effect
...
Fixes part of bug 15211.
2015-03-12 18:57:57 +01:00
Nick Mathewson
3ee2fca7ca
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-12 13:16:22 -04:00
Nick Mathewson
eb68ea20f8
Merge remote-tracking branch 'public/feature15212_026' into maint-0.2.6
2015-03-12 13:15:08 -04:00
Nick Mathewson
16b1b2199d
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-12 13:13:06 -04:00
Yawning Angel
b3281fc6d6
Initialize the extorport auth cookie before launching PTs.
...
PTs expect the auth cookie to be available immedieately after launch,
leading to a race condition when PTs opt to cache the extorport cookie
once immediately after startup.
Fixes #15240 .
2015-03-12 13:12:56 -04:00
Sebastian Hahn
68e9f364a0
don't init threads as side effect of assertion
...
Fixes part of bug 15211.
2015-03-12 17:52:37 +01:00
Nick Mathewson
9063f29160
Revert "Make TransProxyType ipfw work correctly"
...
This reverts commit 681802817d
.
(I didn't mean to backport this, but somehow I had based my branch
for #15205 on it.)
2015-03-12 12:49:08 -04:00
Nick Mathewson
eecd410984
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
2015-03-12 12:27:25 -04:00
Nick Mathewson
b683b9af00
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-12 11:37:56 -04:00
Nick Mathewson
66c8180207
Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.
...
Fixes bug 15245; bugfix on 0.2.6.3-alpha. Thanks to anonym for reporting!
2015-03-12 11:14:39 -04:00
Nick Mathewson
2bfdfc849b
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-12 10:06:10 -04:00
Nick Mathewson
192ed94410
Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash
...
When calling pthread_attr_setdetachstate, we were using 1 as the
argument. But the pthreads documentation says that you have to say
PTHREAD_CREATE_DETACH, which on Solaris is apparently 0x40. Calling
pthread_attr_setdetachstate with 1 crashes on Solaris with FLTBOUNDS.
(Because we're so late in the release cycle, I made the code define
PTHREAD_CREATE_DETACHED if it doesn't exist, so we aren't likely to
break any other platforms.)
This bug was introduced when we made threading mandatory in
0.2.6.1-alpha; previously, we had force-disabled threading on
Solaris. See #9495 discussion.
2015-03-12 10:03:02 -04:00
Nick Mathewson
809517a863
Allow {World,Group}Writable on AF_UNIX {Socks,Control}Ports.
...
Closes ticket 15220
2015-03-11 13:31:33 -04:00
Nick Mathewson
d29a8ad564
Add link protocol version counts to the heartbeat message
...
Closes ticket 15212
2015-03-10 10:07:41 -04:00
Nick Mathewson
28b4ab784d
Remove one changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc
2015-03-10 08:46:21 -04:00
Nick Mathewson
bd00c152bb
Remove the changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc or earlier.
2015-03-10 08:45:26 -04:00
Nick Mathewson
e732ec295d
Merge commit 'origin/maint-0.2.6^'
2015-03-10 08:36:53 -04:00
Nick Mathewson
1af67d7f72
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
2015-03-09 19:47:12 -04:00
Nick Mathewson
59f4c41087
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 16:25:41 -04:00
Nick Mathewson
7c9be64e1a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-03-09 16:25:11 -04:00
Nick Mathewson
306f2f0eff
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-03-09 16:24:44 -04:00
Nick Mathewson
220e9be095
Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
2015-03-09 16:24:07 -04:00
Nick Mathewson
5588e677bd
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-03-09 16:23:55 -04:00
Karsten Loesing
62714068d9
Update geoip6 to the March 3 2015 database.
2015-03-09 21:11:52 +01:00
Karsten Loesing
beda8d2934
Update geoip to the March 3 2015 database.
2015-03-09 21:09:44 +01:00
Nick Mathewson
24c031b1a2
Don't use checked strl{cat,cpy} on OSX.
...
There is a bug in the overlap-checking in strlcat that can crash Tor
servers. Fixes bug 15205; this is an OSX bug, not a Tor bug.
2015-03-09 15:09:49 -04:00
Nick Mathewson
e3b6373003
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 13:50:05 -04:00
Nick Mathewson
c066f2d30b
We actually merged this one a while ago.
2015-03-09 13:49:55 -04:00
Nick Mathewson
4af742fe97
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 13:24:26 -04:00
Nick Mathewson
8450f6e9a0
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-03-09 13:21:20 -04:00
Nick Mathewson
448bd22092
Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5
2015-03-09 13:17:20 -04:00
Nick Mathewson
62631904cb
GETINFO bw-event-cache to get information on recent BW events
...
Closes 14128; useful to regain functionality lost because of 13988.
2015-03-09 13:13:56 -04:00
Nick Mathewson
e3408248b9
Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5
2015-03-09 13:12:54 -04:00
Nick Mathewson
410ce4cb49
Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5
2015-03-09 13:09:50 -04:00
Nick Mathewson
ed7f2482e2
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 13:08:20 -04:00
Nick Mathewson
fb0de57ba2
Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6
2015-03-09 13:05:27 -04:00
Nick Mathewson
0ec135b696
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 11:14:03 -04:00
Nick Mathewson
42d877f084
Changes file for 15188
2015-03-09 11:13:57 -04:00
Nick Mathewson
bd80ba9a9f
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 11:10:04 -04:00
Nick Mathewson
a7f75b2056
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-03-09 11:09:49 -04:00
Nick Mathewson
1a7419c3df
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-03-09 11:09:30 -04:00
Nick Mathewson
6704e18dd2
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-03-09 11:08:57 -04:00
Nick Mathewson
addffcc14d
Adjust changes header
2015-03-09 11:07:50 -04:00
cypherpunks
034f51dd02
Be exact about the number of spaces in the header.
...
Also fixes changes files that warn on this.
2015-03-09 09:00:40 -04:00
cypherpunks
9dc90a5b7b
Add check-changes
rule for checking formatting of changes files.
...
Additional fixes to make the change work;
- fix Python 2 vs 3 issues
- fix some PEP 8 warnings
- handle paths with numbers correctly
- mention the make rule in doc/HACKING.
2015-03-09 09:00:12 -04:00
Nick Mathewson
4ced3b59aa
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-04 15:19:43 +01:00
Nick Mathewson
de2c5ad815
Revert "Missing dependencies; fixes 15127."
...
This reverts commit 930ab95e1f
.
2015-03-04 15:18:33 +01:00
Nick Mathewson
6ae9769b29
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-04 12:29:25 +01:00
Nick Mathewson
a726cd76df
Merge remote-tracking branch 'public/bug15064_025' into maint-0.2.6
2015-03-04 12:26:43 +01:00
Nick Mathewson
681802817d
Make TransProxyType ipfw work correctly
...
Fixes bug 15064; bugfix on 0.2.5.4-alpha.
2015-03-04 12:25:52 +01:00
Nick Mathewson
55e1fe874d
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-04 12:20:01 +01:00