22431 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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	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	aec45bc0b1	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-02-17 17:10:47 -05:00
Nick Mathewson	5222054163	Merge branch 'maint-0.2.7' into maint-0.2.8	2017-02-15 07:52:47 -05:00
Nick Mathewson	e6376a8004	Merge branch 'maint-0.2.6' into maint-0.2.7	2017-02-15 07:52:41 -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	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	67877f55ad	Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7	2017-02-15 07:51:48 -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	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	9ff76185d2	Merge branch 'maint-0.2.7' into maint-0.2.8	2017-02-13 15:39:13 -05:00
Roger Dingledine	5c4235888a	Merge branch 'maint-0.2.6' into maint-0.2.7	2017-02-13 15:28:50 -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	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
Nick Mathewson	eca4a89319	Merge branch 'maint-0.2.7' into maint-0.2.8	2017-02-07 10:39:13 -05:00
Nick Mathewson	4bce2072ac	Merge branch 'maint-0.2.6' into maint-0.2.7	2017-02-07 10:39:03 -05: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
Nick Mathewson	5b60bd84f2	Bump the version to 0.2.7.6-dev again	2017-02-07 09:59:54 -05:00