cac910c42d
Merge branch 'maint-0.4.0' into release-0.4.0
2019-08-08 11:11:31 +10:00
97e7be2717
Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0
2019-08-08 11:07:34 +10:00
56fdd4f169
Merge branch 'maint-0.4.0' into release-0.4.0
2019-07-01 14:25:12 -04:00
2a42d6be27
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-07-01 14:25:12 -04:00
1dd9527897
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-07-01 14:25:12 -04:00
7b05f19801
Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040
...
This merge removes an incorrect comment about the stem version
and commit script.
2019-07-01 14:36:15 +10:00
84f2c0affb
Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035
2019-07-01 14:33:37 +10:00
fb977f8cac
changes: file for 28795
...
Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc
in December 2018 (of which ~122 were still functional), with a
list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
in June 2019.
Closes ticket 28795.
Note that we created extra lists from DE and US, but they didn't add
any more fallbacks when we tried to merge them.
2019-06-28 21:38:33 +10:00
63325c0596
Add a chutney mode to travis.yml.
2019-06-12 08:55:38 -04:00
a219449b9c
Merge branch 'maint-0.4.0' into release-0.4.0
2019-06-11 10:17:18 -04:00
afa2c39baa
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-06-11 10:17:18 -04:00
b0fa1f4fb0
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-06-11 10:17:17 -04:00
0ec4ebd00d
Update geoip and geoip6 to the June 10 2019 database.
2019-06-11 16:12:50 +02:00
dcb8cad4e6
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
2019-06-11 14:51:46 +10:00
a742a80eea
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
2019-06-11 14:51:37 +10:00
202ccc3930
Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
2019-06-11 14:48:52 +10:00
a58c4cc6dd
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5
2019-06-11 14:47:40 +10:00
cb20054ccd
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
2019-06-11 14:46:24 +10:00
66c3077516
Merge branch 'maint-0.4.0' into release-0.4.0
2019-06-10 18:44:31 -04:00
c8447f95ec
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
2019-06-10 18:44:20 -04:00
0fe3b373ac
Merge branch 'maint-0.4.0' into release-0.4.0
2019-06-10 18:33:26 -04:00
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040
2019-06-10 20:50:53 +10:00
be0a4be276
Travis: Skip test_rebind on macOS builds
...
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.
Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.
Fixes bug 30713; bugfix on 0.3.5.1-alpha.
2019-06-10 20:49:59 +10:00
d761c3ca6d
Travis: allow the test-stem job to fail
...
Allow the test-stem job to fail in Travis, because it sometimes hangs.
Fixes bug 30744; bugfix on 0.3.5.4-alpha.
2019-06-10 19:18:35 +10:00
463ded569c
Merge branch 'maint-0.4.0' into release-0.4.0
2019-06-05 16:24:10 -04:00
6a6f7eb671
Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0
2019-06-05 16:22:52 -04:00
d63c17f2af
Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
2019-06-05 16:22:29 -04:00
e51b57ee04
Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0
2019-06-05 16:16:34 -04:00
2300a619a5
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0
2019-06-05 16:13:53 -04:00
851e881f01
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0
2019-06-05 16:12:07 -04:00
a56d7e37aa
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0
2019-06-05 16:10:51 -04:00
121d271dc6
Merge branch 'maint-0.4.0' into release-0.4.0
2019-05-29 21:20:02 +03:00
00108b75d4
Merge branch 'tor-github/pr/924' into maint-0.4.0
2019-05-29 21:19:56 +03:00
245dccb77d
Merge remote-tracking branch 'nickm/ticket30454_034_01_squashed' into ticket30454_035_01
2019-05-22 11:43:55 -04:00
9f52b87518
hs: Add changes file for #30454
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-05-20 08:56:34 -04:00
e5deb2bbc7
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-05-17 08:10:16 -04:00
63e0599c57
Merge branch 'maint-0.4.0' into release-0.4.0
2019-05-17 08:10:16 -04:00
c7f9f7e542
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-05-17 08:10:16 -04:00
a521c42788
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-05-17 08:10:15 -04:00
4e262196a8
Update geoip and geoip6 to the May 13 2019 database.
2019-05-17 08:52:13 +02:00
72e799d28e
Merge branch 'maint-0.4.0' into release-0.4.0
2019-05-15 13:46:19 +03:00
cd264e145b
Merge branch 'tor-github/pr/1013' into maint-0.4.0
2019-05-15 13:45:39 +03:00
1b16fcb70c
Add a --list-modules command
...
Closes ticket 30452.
2019-05-14 19:19:53 -04:00
ff55840343
Don't pass a NULL into a %s when logging client auth file load failure
...
Fortunately, in 0.3.5.1-alpha we improved logging for various
failure cases involved with onion service client auth.
Unfortunately, for this one, we freed the file right before logging
its name.
Fortunately, tor_free() sets its pointer to NULL, so we didn't have
a use-after-free bug.
Unfortunately, passing NULL to %s is not defined.
Fortunately, GCC 9.1.1 caught the issue!
Unfortunately, nobody has actually tried building Tor with GCC 9.1.1
before. Or if they had, they didn't report the warning.
Fixes bug 30475; bugfix on 0.3.5.1-alpha.
2019-05-10 17:47:43 -04:00
bf071e34aa
Add bug29930 into changelog/releasenotes
2019-05-02 08:50:45 -04:00
672c72d7d7
Merge branch 'release-0.4.0' of git-rw.torproject.org:/tor into release-0.4.0
2019-04-30 15:52:39 -04:00
955d73d1e9
Fold changes entries into releasenotes and changelog
2019-04-30 15:49:26 -04:00
603074ea18
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-30 19:26:30 +03:00
e1d4e2badb
Merge branch 'tor-github/pr/978' into maint-0.4.0
2019-04-30 19:26:14 +03:00
b05b165a75
Add changes file
2019-04-30 09:16:36 +03:00
teor
Nick Mathewson
Karsten Loesing
George Kadianakis
David Goulet
rl1987