24249 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	16bddc35ca	Port 0.2.9.10 changelog and releasenotes to master	2017-03-01 08:17:52 -05:00
Nick Mathewson	39d0e0cd0b	Merge branch 'maint-0.3.0'	2017-03-01 07:52:51 -05:00
teor	f2ca22f940	Remove the space before the interpreter name in test-network.sh ... Apparently some unixes don't like this. Part of #21581.	2017-03-01 12:28:16 +11:00
Nick Mathewson	8e3d929df7	Merge branch 'maint-0.3.0'	2017-02-28 20:14:06 -05:00
teor	a3bec9aa5a	Remove a spurious test-network-all warning that triggers when sh is not bash ... Part of 21581.	2017-03-01 11:54:31 +11:00
teor	004ec8dc58	Restore support for test-network.sh on BSD and other systems without bash ... (But use bash if it's available.) This is a workaround until we remove bash-specific code in 19699. Fixes bug 21581; bugfix on 21562, not in any released version of tor.	2017-03-01 11:40:54 +11:00
Nick Mathewson	1cd7a697f1	Merge remote-tracking branch 'teor/bug21510'	2017-02-28 11:43:58 -05:00
Nick Mathewson	aa50758777	Merge remote-tracking branch 'teor/test21470-029'	2017-02-28 11:31:07 -05:00
Nick Mathewson	ef610467fa	Merge remote-tracking branch 'teor/bug21507-029'	2017-02-28 11:19:24 -05:00
Nick Mathewson	242f9b3ffb	Merge remote-tracking branch 'public/bug21407'	2017-02-28 11:17:30 -05:00
Nick Mathewson	9ec08f9899	Merge branch 'maint-0.3.0' ... This is an "ours" merge to avoid a version bump.	2017-02-28 10:40:34 -05:00
Nick Mathewson	58908b6540	bump version to 0.3.0.4-rc	2017-02-28 10:40:08 -05:00
Nick Mathewson	4128a8cabd	Merge branch 'maint-0.2.9' into maint-0.3.0 ... This is an "ours" merge to avoid a version bump.	2017-02-28 10:39:29 -05:00
Nick Mathewson	b049a5b398	bump version to 0.2.9.10	2017-02-28 10:38:55 -05:00
Nick Mathewson	3e07a54928	Merge branch 'maint-0.2.8' into maint-0.2.9 ... This is an "ours" merge to avoid taking a version bump	2017-02-28 10:38:31 -05:00
Nick Mathewson	f93bcab60e	Merge branch 'maint-0.2.7-redux' into maint-0.2.8 ... This is an "ours" merge to avoid taking a version bump, and to avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.	2017-02-28 10:37:25 -05:00
Nick Mathewson	f2a657c22b	bump version to 0.2.8.13	2017-02-28 10:34:33 -05:00
Nick Mathewson	b5526bef38	Bump version to 0.2.7.7	2017-02-28 10:27:20 -05:00
Nick Mathewson	1174b50cab	Merge branch 'maint-0.2.6' into maint-0.2.7-redux ... "ours" merge to avoid version bumps	2017-02-28 10:26:45 -05:00
Nick Mathewson	57e778f882	bump to 0.2.6.11	2017-02-28 10:26:24 -05:00
Nick Mathewson	ccdf0b319c	Merge branch 'maint-0.2.5' into maint-0.2.6 ... "ours" merge to avoid version bumps	2017-02-28 10:25:51 -05:00
Nick Mathewson	884b3717a9	Bump version to 0.2.5.13	2017-02-28 10:23:20 -05:00
Nick Mathewson	b2b604ecb4	Merge branch 'maint-0.2.4' into maint-0.2.5 ... "ours" merge to avoid bumping version	2017-02-28 10:22:36 -05:00
Nick Mathewson	4bab288a82	Bump to 0.2.4.28	2017-02-28 10:20:46 -05:00
Nick Mathewson	1453bda67b	Update changelog sorting rules to know about dirauth changes	2017-02-28 10:12:17 -05:00
Nick Mathewson	3c56db431e	Remove changes files from master for items in <=0.3.0.4-rc	2017-02-28 09:27:04 -05:00
Nick Mathewson	8112800138	Merge branch 'maint-0.3.0'	2017-02-28 08:28:55 -05:00
Nick Mathewson	3a60214f32	Merge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0	2017-02-28 08:28:46 -05:00
Nick Mathewson	928235506b	Merge branch 'maint-0.3.0'	2017-02-28 08:20:09 -05:00
Nick Mathewson	16f337e763	Merge branch 'bug21027_v2_squashed' into maint-0.3.0	2017-02-28 08:16:43 -05:00
Nick Mathewson	1582adabbb	Change approach to preventing duplicate guards. ... Previously I'd made a bad assumption in the implementation of prop271 in 0.3.0.1-alpha: I'd assumed that there couldn't be two guards with the same identity. That's true for non-bridges, but in the bridge case, we allow two bridges to have the same ID if they have different addr:port combinations -- in order to have the same bridge ID running multiple PTs. Fortunately, this assumption wasn't deeply ingrained: we stop enforcing the "one guard per ID" rule in the bridge case, and instead enforce "one guard per <id,addr,port>". We also needed to tweak our implementation of get_bridge_info_for_guard, since it made the same incorrect assumption. Fixes bug 21027; bugfix on 0.3.0.1-alpha.	2017-02-28 08:16:33 -05:00
Nick Mathewson	c0aa7ac5ac	Merge branch 'disable_memory_sentinels_squashed'	2017-02-27 16:25:25 -05:00
Nick Mathewson	b923c4dc9f	Code to disable memory sentinels for fuzzing ... This feature makes it possible to turn off memory sentinels (like those used for safety in buffers.c and memarea.c) when fuzzing, so that we can catch bugs that they would otherwise prevent.	2017-02-27 16:25:10 -05:00
Nick Mathewson	4808540d5c	Merge branch 'maint-0.3.0'	2017-02-27 11:36:56 -05:00
Nick Mathewson	eef8bd4d3c	Merge remote-tracking branch 'teor/feature21570-030' into maint-0.3.0	2017-02-27 11:36:39 -05:00
Nick Mathewson	b6a9be0415	Merge branch 'maint-0.3.0'	2017-02-27 11:25:46 -05:00
Nick Mathewson	c51919b0da	Merge branch 'bug21369_check_029_squashed' into maint-0.3.0	2017-02-27 11:25:34 -05:00
Nick Mathewson	90283f0db3	Merge branch 'maint-0.3.0'	2017-02-27 11:23:02 -05:00
Nick Mathewson	6747c62386	Merge branch 'bug21420_029_squashed' into maint-0.3.0	2017-02-27 11:20:39 -05:00
Nick Mathewson	f6e5a658df	Revise the logic for picking the start time for link certs ... Since 0.2.4.11-alpha (in 0196647970) we've tried to randomize the start time to up to some time in the past. But unfortunately we allowed the start time to be in the future as well, which isn't really legit. The new behavior lets the start time be be up to MAX(cert_lifetime-2days, 0) in the past, but never in the future. Fixes bug 21420; bugfix on 0.2.4.11-alpha.	2017-02-27 11:19:54 -05:00
Nick Mathewson	1421f75331	Merge branch 'maint-0.3.0'	2017-02-27 11:03:25 -05:00
Nick Mathewson	2b3518b81f	Merge remote-tracking branch 'teor/bug20711' into maint-0.3.0	2017-02-27 11:00:02 -05:00
Nick Mathewson	65b012c90b	Fix a wide line	2017-02-27 10:58:26 -05:00
Nick Mathewson	135a0c2054	Fix a "directive within macro arguments" warning	2017-02-27 10:58:19 -05:00
Nick Mathewson	0e7d2882f9	Merge remote-tracking branch 'ahf/bugs/21206'	2017-02-27 10:53:12 -05:00
teor	73879aa5b6	Use bash in src/test/test-network.sh ... This ensures we reliably call chutney's newer tools/test-network.sh when available. Fixes bug 21562; bugfix on tor-0.2.9.1-alpha.	2017-02-28 02:13:56 +11:00
teor	1ebcd22e80	Reserve a test-network.sh exit status of 2 for unknown arguments ... Part of 21570.	2017-02-28 02:02:32 +11:00
teor	fb32c52232	Log tor warnings during 'make test-network-all' ... Requires the chutney changes from 21572. (Otherwise, asks users to upgrade their chutney.) Implements 21570.	2017-02-28 02:01:37 +11:00
Nick Mathewson	074f248463	Add one other BUG check to try to fix/solve 21369. ... Teor thinks that this connection_dirserv_add_dir_bytes_to_outbuf() might be the problem, if the "remaining" calculation underflows. So I'm adding a couple of checks there, and improving the casts.	2017-02-27 10:01:27 -05:00
Nick Mathewson	ee5471f9aa	Try to check for (and prevent) buffer size INT_MAX overflow better. ... Possible fix or diagnostic for 21369.	2017-02-27 10:01:27 -05:00