21110 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	8e439a66f3	Bump to 0.2.4.29	2017-06-08 09:25:31 -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	9a6f938582	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-06-05 14:48:30 -04:00
Nick Mathewson	a56cfdaba2	Merge branch 'maint-0.2.5' into maint-0.2.6 ... Ours merge to avoid taking 4ee48cb434	2017-06-05 14:39:06 -04:00
Nick Mathewson	2e5220cb8b	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-06-05 14:38:54 -04:00
Nick Mathewson	4ee48cb434	Fix C89 warning (since Tor 0.2.4-5 still care about that.)	2017-06-05 14:38:38 -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	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	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	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	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	aec45bc0b1	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-02-17 17:10:47 -05:00
Nick Mathewson	f7ed4a7d8f	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-02-15 07:52:33 -05:00
Nick Mathewson	6e7ff9ee31	Merge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6	2017-02-15 07:51:41 -05:00
Nick Mathewson	aeb299ba6d	Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5	2017-02-15 07:51:33 -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	e778a411b9	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-02-13 15:27:57 -05:00
Roger Dingledine	144ec3d58c	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-02-13 15:23:50 -05:00
Roger Dingledine	635c5a8a92	be sure to remember the changes file for #20384	2017-02-13 15:22:36 -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
Nick Mathewson	8a1f0876ed	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-02-07 10:38:05 -05:00
Nick Mathewson	f2a30413a3	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-02-07 10:37:53 -05:00
Nick Mathewson	2ce4330249	Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5	2017-02-07 10:37:43 -05:00
Nick Mathewson	c056d19323	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-02-07 10:37:31 -05:00
Nick Mathewson	3f5a710958	Revert "Revert "Add hidserv-stats filname to our sandbox filter"" ... This reverts commit 5446cb8d3d. The underlying revert was done in 0.2.6, since we aren't backporting seccomp2 loosening fixes to 0.2.6. But the fix (for 17354) already went out in 0.2.7.4-rc, so we shouldn't revert it in 0.2.7.	2017-02-07 10:13:20 -05:00