4424 Commits

Author	SHA1	Message	Date
Nick Mathewson	64ac28ef5d	Changelog for 0.2.8.14	2017-06-08 09:58:36 -04:00
Nick Mathewson	3ce02372d6	Merge branch 'maint-0.2.8' into release-0.2.8	2017-06-08 09:21:15 -04:00
Nick Mathewson	d15d09a968	Merge branch 'maint-0.2.7-redux' into maint-0.2.8	2017-06-08 09:21:15 -04:00
Nick Mathewson	c1646d6e89	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-06-08 09:21:15 -04:00
Nick Mathewson	40bccc2004	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-06-08 09:21:15 -04:00
Nick Mathewson	dec7998f5c	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-06-08 09:21:15 -04:00
David Goulet	56a7c5bc15	TROVE-2017-005: Fix assertion failure in connection_edge_process_relay_cell ... On an hidden service rendezvous circuit, a BEGIN_DIR could be sent (maliciously) which would trigger a tor_assert() because connection_edge_process_relay_cell() thought that the circuit is an or_circuit_t but is an origin circuit in reality. Fixes #22494 Reported-by: Roger Dingledine <arma@torproject.org> Signed-off-by: David Goulet <dgoulet@torproject.org>	2017-06-08 09:21:10 -04:00
Nick Mathewson	33b500851c	Merge branch 'maint-0.2.8' into release-0.2.8	2017-06-05 12:01:27 -04:00
Nick Mathewson	33fcc0f61d	Merge branch 'maint-0.2.7-redux' into maint-0.2.8	2017-06-05 12:01:17 -04:00
Nick Mathewson	3f2d1f7f07	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-06-05 12:00:41 -04:00
Nick Mathewson	9ea3d0877a	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-06-05 12:00:27 -04:00
Nick Mathewson	1a540b5792	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-06-05 12:00:08 -04:00
Nick Mathewson	e3ebae4804	Fix undefined behavior in geoip_parse_entry(). ... Fixes bug 22490; bugfix on 6a241ff3ff in 0.2.4.6-alpha. Found by teor using clang-5.0's AddressSanitizer stack-use-after-scope.	2017-06-05 10:09:39 -04:00
Nick Mathewson	df842d84a8	Merge branch 'maint-0.2.8' into release-0.2.8	2017-05-16 08:38:53 -04:00
teor	5b45d73293	Update fallback directory mirrors in May 2017 ... Replace the 177 fallbacks originally introduced in Tor 0.2.9.8 in December 2016 (of which ~126 were still functional), with a list of 151 fallbacks (32 new, 119 existing, 58 removed) generated in May 2017. Resolves ticket 21564.	2017-05-16 19:02:42 +10:00
Nick Mathewson	1e4a5dc9d1	Merge branch 'maint-0.2.8' into release-0.2.8	2017-05-08 08:08:26 -04:00
Nick Mathewson	dc34cd7a04	Merge branch 'maint-0.2.7-redux' into maint-0.2.8	2017-05-08 08:07:19 -04:00
Nick Mathewson	71dd1d716a	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-05-08 08:07:11 -04:00
Nick Mathewson	159ddf6dde	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-05-08 08:07:04 -04:00
Nick Mathewson	68d6720452	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-05-08 08:06:59 -04:00
Karsten Loesing	5207e41ffe	Update geoip and geoip6 to the May 2 2017 database.	2017-05-08 10:09:42 +02:00
Nick Mathewson	7758c66b31	Merge branch 'maint-0.2.8' into release-0.2.8	2017-04-06 08:32:56 -04:00
Nick Mathewson	91c6b18ca0	Merge branch 'maint-0.2.7-redux' into maint-0.2.8	2017-04-06 08:31:32 -04:00
Nick Mathewson	44bc8821b1	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-04-06 08:31:23 -04:00
Nick Mathewson	21d776738c	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-04-06 08:31:18 -04:00
Nick Mathewson	a8a860e1da	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-04-06 08:31:12 -04:00
Karsten Loesing	9d7933296c	Update geoip and geoip6 to the April 4 2017 database.	2017-04-06 10:52:39 +02:00
Nick Mathewson	d6021989d9	Merge branch 'maint-0.2.8' into release-0.2.8	2017-03-08 10:11:58 -05:00
Nick Mathewson	2cfecec9c7	Merge branch 'maint-0.2.7-redux' into maint-0.2.8	2017-03-08 10:11:23 -05:00
Nick Mathewson	25c28bc2d9	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-03-08 10:11:05 -05:00
Nick Mathewson	ecc73c3c03	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-03-08 10:10:44 -05:00
Nick Mathewson	933a1e7997	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-03-08 10:10:29 -05:00
Karsten Loesing	4488c319dd	Update geoip and geoip6 to the March 7 2017 database.	2017-03-08 09:41:35 +01:00
Nick Mathewson	c159617c0c	Start an 0.2.8.13 changelog	2017-02-23 16:08:09 -05:00
Nick Mathewson	aec45bc0b1	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-02-17 17:10:47 -05:00
Nick Mathewson	a33d9f9b2b	Merge branch 'maint-0.2.8' into release-0.2.8	2017-02-15 07:53:13 -05:00
Nick Mathewson	71cd68b66b	Merge branch 'maint-0.2.8' of git-rw.torproject.org:/tor into maint-0.2.8	2017-02-15 07:51:57 -05:00
Nick Mathewson	383fdeca12	Merge branch 'maint-0.2.8' into release-0.2.8	2017-02-15 07:50:58 -05:00
Nick Mathewson	1ebdae6171	Merge branch 'maint-0.2.7' into maint-0.2.8	2017-02-15 07:47:28 -05:00
Nick Mathewson	ed806843dc	Merge branch 'maint-0.2.6' into maint-0.2.7	2017-02-15 07:47:21 -05:00
Nick Mathewson	3781f24b80	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-02-15 07:47:12 -05:00
Nick Mathewson	a452b71395	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-02-15 07:47:04 -05:00
Nick Mathewson	194e31057f	Avoid integer underflow in tor_version_compare. ... Fix for TROVE-2017-001 and bug 21278. (Note: Instead of handling signed ints "correctly", we keep the old behavior, except for the part where we would crash with -ftrapv.)	2017-02-14 16:10:27 -05:00
Roger Dingledine	635c5a8a92	be sure to remember the changes file for #20384	2017-02-13 15:22:36 -05:00
Nick Mathewson	d309d28ca5	Merge branch 'maint-0.2.8' into release-0.2.8	2017-02-13 14:39:21 -05:00
Nick Mathewson	9b90d515a9	Merge branch 'maint-0.2.7' into maint-0.2.8	2017-02-13 14:37:55 -05:00
Nick Mathewson	75fe218b16	Merge branch 'maint-0.2.6' into maint-0.2.7	2017-02-13 14:37:49 -05:00
Nick Mathewson	43c18b1b7a	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-02-13 14:37:42 -05:00
Nick Mathewson	124062e843	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-02-13 14:37:01 -05:00
Karsten Loesing	f6016058b4	Update geoip and geoip6 to the February 8 2017 database.	2017-02-12 15:56:31 +01:00