Commit Graph

30690 Commits

Author SHA1 Message Date
Nick Mathewson 580c68ec1d Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-18 08:04:40 -05:00
Nick Mathewson d8f41c2870 Bump to 0.3.5.6-rc 2018-12-18 08:04:04 -05:00
Nick Mathewson 7f98df0731 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-17 10:57:51 -05:00
Nick Mathewson 1a9a9fc0ff Changes file for 28562 2018-12-17 10:57:47 -05:00
Taylor R Campbell ed71e1e89c Create a temporary directory for tor's DataDirectory in test_rebind.
Fixes #28562.

While here, put the argument count test and usage message _before_ we
attempt to read from sys.argv.
2018-12-17 10:32:28 -05:00
Nick Mathewson 78a7479445 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-13 18:57:04 -05:00
Nick Mathewson 94a7998158 Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5 2018-12-13 18:57:00 -05:00
Nick Mathewson 54fedab54a Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-13 08:22:04 -05:00
Nick Mathewson a3fe081647 Merge remote-tracking branch 'teor/bug28826-035' into maint-0.3.5 2018-12-13 08:22:01 -05:00
teor 8651fe8959 Appveyor: Explain appveyor image names in the comments
Appveyor images are named after the Visual Studio version they contain.
But we compile using MinGW, not Visual Studio.
We use these images because they have different Windows versions.

Closes bug 28826.
2018-12-12 10:26:21 +10:00
Nick Mathewson 06870e3018 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-11 10:00:22 -05:00
Nick Mathewson b2625b09f1 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-12-11 10:00:22 -05:00
Nick Mathewson 633813e313 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-12-11 10:00:22 -05:00
Nick Mathewson 93019b4787 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-12-11 10:00:22 -05:00
Nick Mathewson 3b5188576f Note ticket number in changes file for 24803 2018-12-11 10:00:19 -05:00
Nick Mathewson 433cff76a2 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-11 09:41:05 -05:00
Nick Mathewson e1273d7d1b Merge branch 'maint-0.3.4' into maint-0.3.5 2018-12-11 09:41:05 -05:00
Nick Mathewson 6506b1ee9f Merge branch 'maint-0.3.3' into maint-0.3.4 2018-12-11 09:41:05 -05:00
Nick Mathewson c1f9191581 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-12-11 09:41:04 -05:00
Taylor Yu 1b855af5e3 Log bootstrap tag names
Add the bootstrap tag name to the log messages, so people
troubleshooting connection problems can look up a symbol instead of a
number.  Closes ticket 28731.
2018-12-10 17:22:28 -06:00
teor 4991b29311 Fallbacks: Update the hard-coded fallback list in December 2018
Merge Phoul's two lists into teor's list.

Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
157 fallbacks (92 new, 65 existing, 85 removed) generated in
December 2018.

Closes ticket 24803.
2018-12-10 17:02:19 +10:00
teor 78e177d622 Fallbacks: Update the hard-coded fallback list in December 2018
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
148 fallbacks (89 new, 59 existing, 91 removed) generated in
December 2018.

Closes ticket 24803.
2018-12-07 16:43:10 +10:00
Nick Mathewson a4c608af3c Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-06 09:26:34 -05:00
Nick Mathewson c1f86f7492 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-12-06 09:26:33 -05:00
Nick Mathewson c4f7953d8b Merge branch 'maint-0.3.3' into maint-0.3.4 2018-12-06 09:26:32 -05:00
Nick Mathewson 00341d97f3 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-12-06 09:26:32 -05:00
Karsten Loesing 57798eb1cb Update geoip and geoip6 to the December 5 2018 database. 2018-12-05 21:02:39 +01:00
Nick Mathewson b9d0aa2108 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-05 10:25:12 -05:00
Nick Mathewson 967efc0d28 Merge remote-tracking branch 'tor-github/pr/546' into maint-0.3.5 2018-12-05 10:23:28 -05:00
David Goulet 85674f59b3 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-04 12:55:01 -05:00
David Goulet 0906dde9d5 man: Document HSv3 client authorization revocation
Removing a ".auth" file revokes a client access to the service but the
rendezvous circuit is not closed service side because the service simply
doesn't know which circuit is for which client.

This commit notes in the man page that to fully revoke a client access to the
service, the tor process should be restarted.

Closes #28275

Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-12-04 18:49:19 +02:00
Nick Mathewson c811ae3bd6 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-01 11:26:55 -05:00
Nick Mathewson 1a97379e5e Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5 2018-12-01 11:26:52 -05:00
Nick Mathewson 6267ea5fbe Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-01 11:20:10 -05:00
Nick Mathewson 11a91ef728 Merge branch 'bug28229_diag_035' into maint-0.3.5 2018-12-01 11:20:04 -05:00
rl1987 945c4dfda0 Also log a Tor log entry when it has a substring we are waiting for 2018-12-01 11:18:03 -05:00
rl1987 4c4ed413ee 1 ms. resolution for Tor logs 2018-12-01 11:18:03 -05:00
rl1987 9bbf7ec303 Add changes file 2018-12-01 11:18:03 -05:00
rl1987 0bb25931dc Log everything from tor down to debug loglevel 2018-12-01 11:18:03 -05:00
rl1987 320f5f30b3 In test_rebind.py, log stuff with timestamps 2018-12-01 11:18:03 -05:00
Nick Mathewson e3a19b1c78 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-12-01 11:15:09 -05:00
Nick Mathewson 8954cbfcf8 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-01 11:15:09 -05:00
Nick Mathewson e82023d2f7 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-12-01 11:15:09 -05:00
Neel Chauhan d18a167ff3 sr: Switch from tor_assert() to BUG()
Closes #19566

Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-11-30 12:16:18 -05:00
Nick Mathewson 4b37c2d1dc Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-27 12:03:50 -05:00
Nick Mathewson 72c1303cef Merge branch 'maint-0.3.4' into maint-0.3.5 2018-11-27 12:03:50 -05:00
Alexander Færøy 36c3235534 Explicitly specify path to OpenSSL for Appveyor.
This patch explicitly specifies the path to our OpenSSL dependency and
disables the installation of an external OpenSSL version and instead
uses the OpenSSL version available from the MinGW environments.

See: https://bugs.torproject.org/28574
2018-11-27 14:53:50 +01:00
Nick Mathewson 3153c27263 Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-26 17:27:36 -05:00
Nick Mathewson feb41b7c30 Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5 2018-11-26 17:24:41 -05:00
David Goulet fc591870b3 Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-26 14:59:23 -05:00