Nick Mathewson
f2df0fc887
Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux
2017-04-06 08:32:48 -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
ae0586ff89
Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux
2017-03-08 10:11:16 -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
da819deb56
Pick a date, update ReleaseNotes. (0.2.7)
2017-03-03 14:57:19 -05:00
Nick Mathewson
01a00d0f94
Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux
2017-02-28 10:27:29 -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
1fe5097132
Sort changelog in release-0.2.7-redux
2017-02-28 10:11:45 -05:00
Nick Mathewson
680d940298
Adjust 0.2.7.7 changelog entry from 0.3.0.4-rc to match
2017-02-28 10:05:23 -05:00
Nick Mathewson
9da2c9954d
whoops; missed one
2017-02-23 16:08:20 -05:00
Nick Mathewson
4496301aa7
Begin an 0.2.7.7 changelog
...
To build this changelog, I've gone through the entries in
release-0.2.4's changes subdirectory, and looked up the ChangeLog
entry for each. I have not sorted them yet.
2017-02-23 16:02:41 -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
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
Nick Mathewson
e91bb84a91
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
...
maint-0.2.7-redux is an attempt to try to re-create a plausible
maint-0.2.7 branch. I've started from the tor-0.2.7.6, and then I
merged maint-0.2.6 into the branch.
This has produced 2 conflicts: one related to the
rendcommon->rendcache move, and one to the authority refactoring.
2017-02-07 09:59:12 -05:00
Nick Mathewson
85a2487f97
Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix
2017-02-07 09:49:23 -05:00
Nick Mathewson
cfeb1db2fb
Add comments to connection_check_event().
2017-02-07 09:48:24 -05:00
Nick Mathewson
457d38a6e9
Change behavior on missing/present event to warn instead of asserting.
...
Add a changes file.
2017-02-07 09:48:19 -05:00
Nick Mathewson
650c03127a
If we start/stop reading on a dnsserv connection, don't assert.
...
Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha.
2017-02-07 09:48:13 -05:00
Nick Mathewson
5446cb8d3d
Revert "Add hidserv-stats filname to our sandbox filter"
...
Reverting this in 0.2.6 only -- we're no backporting
seccomp2-loosening fixes to 0.2.6.
This reverts commit 2ec5e24c58
2017-02-07 09:28:50 -05:00
Nick Mathewson
c6f2ae514e
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-07 09:18:54 -05:00
Nick Mathewson
b9ef21cf56
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 09:17:59 -05:00
