23343 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	647dbf65fd	Merge branch 'maint-0.2.9'	2016-12-01 13:37:03 -05:00
Nick Mathewson	9e297f8197	Bump to 0.2.9.6-rc	2016-12-01 13:36:38 -05:00
Nick Mathewson	bb0d668677	Merge branch 'maint-0.2.9'	2016-12-01 13:36:06 -05:00
Nick Mathewson	82bd2af78d	Merge branch 'maint-0.2.8' into maint-0.2.9	2016-12-01 13:35:34 -05:00
Nick Mathewson	9157405c03	Bump to 0.2.8.10	2016-12-01 13:34:21 -05:00
Nick Mathewson	fc47cc3ed9	Merge branch 'maint-0.2.9'	2016-12-01 10:06:17 -05:00
Nick Mathewson	52cb1edda6	Merge branch 'maint-0.2.8' into maint-0.2.9	2016-12-01 10:05:44 -05:00
Nick Mathewson	5efbd41daa	Merge branch 'maint-0.2.9'	2016-12-01 09:50:17 -05:00
Nick Mathewson	f8a7972b29	Merge branch 'bug20638_029_v2_squashed' into maint-0.2.9	2016-12-01 09:45:14 -05:00
teor	f80a43d16f	Stop ignoring hidden service key anonymity when first starting tor ... Instead, refuse to start tor if any hidden service key has been used in a different hidden service anonymity mode. Fixes bug 20638; bugfix on 17178 in 0.2.9.3-alpha; reported by ahf. The original single onion service poisoning code checked poisoning state in options_validate, and poisoned in options_act. This was problematic, because the global array of hidden services had not been populated in options_validate (and there were ordrering issues with hidden service directory creation). This patch fixes this issue in rend_service_check_dir_and_add, which: * creates the directory, or checks permissions on an existing directory, then * checks the poisoning state of the directory, then * poisons the directory. When validating, only the permissions checks and the poisoning state checks are perfomed (the directory is not modified).	2016-12-01 09:44:53 -05:00
teor	91abd60cad	Update unit tests for 20484, 20529 ... Add extra logging and extra validity checks for hidden services.	2016-12-01 09:44:53 -05:00
Nick Mathewson	a7762930c3	Merge remote-tracking branch 'dgoulet/ticket20568_030_01'	2016-12-01 09:23:36 -05:00
Nick Mathewson	c1e8dfd6cf	Fix compilation	2016-12-01 09:20:04 -05:00
s7r	215cc0d527	Improve log messages related to identity key ... Improve the messages logged when Tor wants or needs to load the master ed25519 identity key so the user is explicitly informed when further action is required or not. Fixes ticket #20650.	2016-11-27 13:07:43 +00:00
Nick Mathewson	16fcbd21c9	Try to work around breakage in the OSX 10.12 SDK. ... Apple is supposed to decorate their function declarations with macros to indicate which OSX version introduced them, so that you can tell the compiler that you want to build against certain versions of OSX. But they forgot to do that for clock_gettime() and getentropy(), both of which they introduced in 10.12. This patch adds a kludge to the configure.ac script where, if we detect that we are targeting OSX 10.11 or earlier, we don't even probe to see if the two offending functions are present. Closes ticket 20235.	2016-11-22 19:24:13 -05:00
Nick Mathewson	4614f8e681	Merge remote-tracking branch 'teor/fix-mingw-pagesize'	2016-11-22 18:29:50 -05:00
Nick Mathewson	c35d481f56	Merge branch 'maint-0.2.9'	2016-11-21 12:44:21 -05:00
Nick Mathewson	e2c881487c	Merge remote-tracking branch 'arma/bug20423' into maint-0.2.9	2016-11-21 12:40:08 -05:00
overcaffeinated	6dc25e79b9	Fix typo ... Remove stray 'To run'	2016-11-21 12:15:44 -05:00
teor	1d1d37bbc6	Refactor rend_service_check_dir_and_add ... Make the function flatter, and prepare for #20559. No behaviour change.	2016-11-18 13:35:54 +11:00
teor	8bdedab8da	Refactor duplicate code out of rend_config_services ... Put that code in rend_service_check_dir_and_add. No behaviour change. This is a defence in depth measure against similar bugs to 20529.	2016-11-18 13:35:09 +11:00
teor	98057d274c	Create HS directories in rend_config_services, then check before use ... (We only create HS directories if we are acting on the config.) Log a BUG warning if the directories aren't present immediately before they are used, then fail.	2016-11-18 13:34:24 +11:00
Nick Mathewson	ded58777c5	Merge remote-tracking branch 'dgoulet/bug20629_030_01'	2016-11-17 20:12:13 -05:00
Nick Mathewson	b5d738e481	Merge remote-tracking branch 'public/bug20558'	2016-11-17 20:10:40 -05:00
Nick Mathewson	a742637f5a	Merge remote-tracking branch 'public/bug20630'	2016-11-17 20:09:44 -05:00
Nick Mathewson	427dcb29b5	Merge branch 'maint-0.2.9'	2016-11-17 20:08:15 -05:00
Nick Mathewson	b7db39e88a	Merge remote-tracking branch 'dgoulet/bug20646_030_01'	2016-11-17 20:08:00 -05:00
Ivan Markin	fe711c2944	Fix and simplify error handling code in rend_service_parse_port_config()	2016-11-17 20:06:37 -05:00
Ivan Markin	a847e16cbb	Fix comment for rend_service_parse_port_config()	2016-11-17 20:05:19 -05:00
Nick Mathewson	8a767ba7fb	Merge remote-tracking branch 'teor/bug20634_029' into maint-0.2.9	2016-11-17 20:02:59 -05:00
Roger Dingledine	f12aad7f09	don't attempt a resolve when the cached answer will do ... For relays that don't know their own address, avoid attempting a local hostname resolve for each descriptor we download. Also cut down on the number of "Success: chose address 'x.x.x.x'" log lines. Fixes bugs 20423 and 20610; bugfix on 0.2.8.1-alpha.	2016-11-16 16:22:11 -05:00
Roger Dingledine	3bb40b213b	refactor router_pick_published_address to have another arg ... no change in behavior except fewer log entries in the case where we use a cached result.	2016-11-16 16:13:03 -05:00
David Goulet	6b13612eef	doc: Add change file for bug #20646 ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2016-11-16 11:28:24 -05:00
Fabian Keil	db2dd8434e	finish_writing_to_file_impl(): Remove temporary file if replacing the existing one failed ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2016-11-16 11:25:26 -05:00
teor	44f3563d87	Changes file for bug 20634	2016-11-16 13:14:03 +11:00
teor	150a2b39b0	fixup! Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4() ... Fix typos: * extra '(' * use assert_log_predicate (without 3 or 4 at the end) Tidy whitespace. Wrap long lines.	2016-11-16 13:14:00 +11:00
Neel Chauhan	0825fc6af9	Add all four error messages to test_address_get_if_addrs6_list_no_internal()	2016-11-16 12:57:13 +11:00
Neel Chauhan	01492d3869	Add all four error messages to test_address_get_if_addrs6_list_internal()	2016-11-16 12:57:09 +11:00
Neel Chauhan	cccc08ad56	Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4()	2016-11-16 12:57:05 +11:00
Nick Mathewson	9a790f7325	Merge branch 'maint-0.2.9'	2016-11-14 10:37:29 -05:00
Fabian Keil	caf7422871	Fix grammar in HiddenServiceSingleHopMode description	2016-11-14 10:28:02 -05:00
Nick Mathewson	307d244640	Fix a "shouldn't have reached this" warning in connection_edge.c ... This was bug 20630; bugfix on f3e158ed where I thought I was committing a documentation-only fix but instead messed up the control flow too.	2016-11-14 09:16:57 -05:00
teor	7918e219d4	Rewrite the fallback directory mirror list changelog entries ... Mention fallback numbers, releases, and dates. This assists in tracking fallback attrition. Closes task 20242. Reported by arma.	2016-11-13 19:39:02 -05:00
David Goulet	c82881a235	hs: Remove pointless NULL check found by Coverity ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2016-11-10 12:32:18 -05:00
David Goulet	a3bbb9ce77	fixup! Move encode_cert to torcert.c and rename it to tor_cert_encode_ed22519()	2016-11-10 11:00:59 -05:00
Neel Chauhan	9f74f8f732	Move encode_cert to torcert.c and rename it to tor_cert_encode_ed22519() ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2016-11-10 11:00:50 -05:00
Nick Mathewson	0980787f91	Merge remote-tracking branch 'dgoulet/bug20570_030_01'	2016-11-10 09:28:31 -05:00
Nick Mathewson	5e16c3f5fa	Merge remote-tracking branch 'dgoulet/bug20567_030_01'	2016-11-10 09:27:45 -05:00
Nick Mathewson	b6164e1604	Merge remote-tracking branch 'public/feature20552'	2016-11-10 09:25:11 -05:00
Nick Mathewson	f82f0c3eb1	Merge remote-tracking branch 'dgoulet/bug20574_030_01'	2016-11-10 09:22:34 -05:00