57931fae0a
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-20 07:50:04 -05:00
ef97543270
Merge remote-tracking branch 'tor-github/pr/607' into maint-0.3.5
2018-12-20 07:49:59 -05:00
02009c66c0
Stop running stem's unit tests as part of "make test-stem"
...
But continue to run stem's unit and online tests during
"make test-stem-full".
Fixes bug 28568; bugfix on 0.2.6.3-alpha.
2018-12-20 13:01:18 +10:00
bc6f149133
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-19 15:36:08 -05:00
b7018b1a24
Merge branch 'ticket28883_035' into maint-0.3.5
2018-12-19 15:36:03 -05:00
6d375e1cb7
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-18 13:56:22 -05:00
26bbeb298d
Merge branch 'bug28612_squashed' into maint-0.3.5
2018-12-18 13:55:57 -05:00
1c2abea30a
Call run_tor_main_loop() in ntmain.c, rather than do_main_loop().
...
Fixes bug 28612; bugfix on 0.3.5.3-alpha.
2018-12-18 13:55:08 -05:00
a8fba6e1d0
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-18 13:52:39 -05:00
702fd6f0f2
Merge branch 'ticket28881_035' into maint-0.3.5
2018-12-18 13:52:36 -05:00
4894d44ab8
Always initialize addr in parse_port_config()
...
It was always analyzed before use, but scan-build wasn't able to
persuade itself of that.
Closes ticket 28881.
2018-12-18 13:52:25 -05:00
a06093faaa
Begin a changelog for 0.3.5.6-rc
2018-12-18 08:14:09 -05:00
e64157a54f
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-18 08:10:11 -05:00
c61cd5775c
Revert "Log bootstrap tag names"
...
This reverts commit 1b855af5e3
2018-12-18 08:09:43 -05:00
7f98df0731
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-17 10:57:51 -05:00
1a9a9fc0ff
Changes file for 28562
2018-12-17 10:57:47 -05:00
315c21d2e2
test_rebind: wait for tor to timeout, even if it is logging a lot
...
Fixes bug 28883; bugfix on 0.3.5.4-alpha.
2018-12-17 09:53:17 -05:00
78a7479445
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-13 18:57:04 -05:00
94a7998158
Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5
2018-12-13 18:57:00 -05:00
06870e3018
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-11 10:00:22 -05:00
b2625b09f1
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-11 10:00:22 -05:00
633813e313
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-11 10:00:22 -05:00
93019b4787
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 10:00:22 -05:00
3b5188576f
Note ticket number in changes file for 24803
2018-12-11 10:00:19 -05:00
433cff76a2
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-11 09:41:05 -05:00
e1273d7d1b
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-11 09:41:05 -05:00
6506b1ee9f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-11 09:41:05 -05:00
c1f9191581
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 09:41:04 -05:00
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
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
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
a4c608af3c
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-06 09:26:34 -05:00
c1f86f7492
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-06 09:26:33 -05:00
c4f7953d8b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-06 09:26:32 -05:00
00341d97f3
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-06 09:26:32 -05:00
57798eb1cb
Update geoip and geoip6 to the December 5 2018 database.
2018-12-05 21:02:39 +01:00
b9d0aa2108
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-05 10:25:12 -05:00
967efc0d28
Merge remote-tracking branch 'tor-github/pr/546' into maint-0.3.5
2018-12-05 10:23:28 -05:00
85674f59b3
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-04 12:55:01 -05:00
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
c811ae3bd6
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-01 11:26:55 -05:00
1a97379e5e
Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5
2018-12-01 11:26:52 -05:00
6267ea5fbe
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-01 11:20:10 -05:00
9bbf7ec303
Add changes file
2018-12-01 11:18:03 -05:00
e3a19b1c78
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-01 11:15:09 -05:00
8954cbfcf8
Merge branch 'maint-0.3.5' into release-0.3.5
2018-12-01 11:15:09 -05:00
e82023d2f7
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-01 11:15:09 -05:00
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
4b37c2d1dc
Merge branch 'maint-0.3.5' into release-0.3.5
2018-11-27 12:03:50 -05:00
72c1303cef
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-27 12:03:50 -05:00
Nick Mathewson
teor
Taylor Yu
Karsten Loesing
David Goulet
rl1987
Neel Chauhan