58d2ced572
Merge remote-tracking branch 'teor/24805-phoul'
2018-12-11 09:38:27 -05:00
ce501a529f
Merge remote-tracking branch 'catalyst-github/ticket27402'
2018-12-11 09:37:41 -05:00
b65166750d
Merge remote-tracking branch 'rl1987/ticket28007_take2'
2018-12-11 09:25:46 -05:00
c4c372f281
Merge remote-tracking branch 'rl1987/ticket28551'
2018-12-11 09:24:35 -05:00
d9b9c1fa76
Changes file for 24805
2018-12-07 17:04:50 +10:00
2ccb9e9444
Merge branch 'maint-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
ecaecaddd8
Add changes file
2018-12-06 15:31:33 +02:00
57798eb1cb
Update geoip and geoip6 to the December 5 2018 database.
2018-12-05 21:02:39 +01:00
46a321fbdd
Merge branch 'maint-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
1eb3719a62
Merge remote-tracking branch 'public/prop298'
2018-12-05 09:43:03 -05:00
1f95e80351
Merge branch 'prop293_squashed'
2018-12-05 09:24:51 -05:00
d4f558e385
Merge remote-tracking branch 'tor-github/pr/531'
2018-12-05 09:02:49 -05:00
4002a84ffe
Merge remote-tracking branch 'tor-github/pr/561'
2018-12-05 08:29:41 -05:00
ca4b86f90a
Merge remote-tracking branch 'tor-github/pr/508'
2018-12-05 08:19:02 -05:00
8506dcdeb7
Merge branch 'maint-0.3.5'
2018-12-04 12:55:02 -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
894d207f84
manpage: Mention that adding new HS is unsupported if Sandbox is enabled
2018-12-03 15:23:01 +02:00
8accf71c44
Merge remote-tracking branch 'tor-github/pr/556'
2018-12-01 20:35:38 -05:00
2b2b97484a
Merge branch 'ticket27490a_squashed'
2018-12-01 20:32:18 -05:00
822cb93cab
Add new option ClientAutoIPv6ORPort to switch between IPv4 and IPv6 OR ports
2018-12-01 14:55:57 -05:00
009205dabe
Add changes file
2018-12-01 14:31:17 -05:00
d4d4a4b2dd
Merge remote-tracking branch 'tor-github/pr/527'
2018-12-01 11:30:53 -05:00
c63d951e7f
Merge remote-tracking branch 'tor-github/pr/530'
2018-12-01 11:28:22 -05:00
51d94cea33
Merge branch 'maint-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
7e9985b75a
Merge remote-tracking branch 'tor-github/pr/536'
2018-12-01 11:24:02 -05:00
af9dc12fab
Merge branch 'maint-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
cf3f7753c3
Merge branch 'maint-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
7685f8ad35
Use table lookup for bootstrap_status_to_string
...
It also no longer distinguishes the case of internal-only paths, which
was often wrong anyway. Closes ticket 27402.
2018-11-30 16:54:01 -06: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
9c2b114b2e
Merge branch 'maint-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
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
8a15d0f69b
Merge branch 'maint-0.3.5'
2018-11-26 17:25:28 -05:00
feb41b7c30
Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5
2018-11-26 17:24:41 -05:00
fc1ad9ab65
Merge remote-tracking branch 'tor-github/pr/495'
2018-11-26 17:17:40 -05:00
e12fdeb181
Changes file for "Dormant Mode" (28335, 2149).
2018-11-26 16:39:44 -05:00
2b9a907bdc
Merge branch 'maint-0.3.5'
2018-11-26 14:59:24 -05:00
056ffdec4c
Merge remote-tracking branch 'dgoulet/ticket28128_035_01' into maint-0.3.5
2018-11-26 14:59:10 -05:00
d37dbb09c2
hs-v3: Do not close RP circuits when deleting an ephemeral service
...
Bug reported on tor-dev@ and here is the detail explanation of the issue:
https://lists.torproject.org/pipermail/tor-dev/2018-November/013558.html
Fixes bug #28619
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-11-26 14:45:53 -05:00
d6eafd06a9
Add changes file
2018-11-26 17:46:27 +02:00
439ffcefd5
changes file for prop293 / ticket 26770
2018-11-25 10:19:08 -05:00
05dee063c8
Emit router families in canonical form
...
This patch has routers use the same canonicalization logic as
authorities when encoding their family lists. Additionally, they
now warn if any router in their list is given by nickname, since
that's error-prone.
This patch also adds some long-overdue tests for family formatting.
2018-11-24 16:35:58 -05:00
Nick Mathewson
teor
rl1987
Karsten Loesing
David Goulet
Neel Chauhan
Taylor Yu
Alexander Færøy