July 2019 - tor-commits - lists.torproject.org

[community/master] Move how to use ansible relayor from technical-setup main page to good practices page
by hiro＠torproject.org 08 Jul '19

08 Jul '19

commit e45978fc08d83d0c0d444240932857eb510a16c9 Author: gus <gus(a)torproject.org> Date: Fri Jul 5 18:28:18 2019 -0400 Move how to use ansible relayor from technical-setup main page to good practices page --- .../relay-operations/technical-setup/contents.lr | 10 +---- .../contents.lr | 52 ++++++++++++---------- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay-operations/technical-setup/contents.lr index 07925c7..886bacc 100644 --- a/content/relay-operations/technical-setup/contents.lr +++ b/content/relay-operations/technical-setup/contents.lr @@ -38,14 +38,6 @@ If you are looking to run a relay with minimal effort we recommend you stick to The installation commands are shown in code blocks and must be executed with root privileges. -## Configuration Management - -If you plan to run more than a single relay, or you want to run a high capacity relay (multiple Tor instances per server) or want to use strong security features like [Offline Master Keys](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/Of… without performing additional steps manually, you may want to use a configuration management for better maintainability. - -There are multiple configuration management solutions for Unix based operating systems (Ansible, Puppet, Salt, ...). - -The following Ansible Role has specifically been build for Tor relay operators and supports multiple operating systems: [Ansible Relayor](http://github.com/nusenu/ansible-relayor). - -Click below in which type of relay do you want to host. +Click below in which type of relay do you want to host and don't forget to read [Relay post-install and good practices](relays-post-install-and-good-practices). --- _slug: {{setup}} diff --git a/content/relay-operations/technical-setup/relays-post-install-and-good-practices/contents.lr b/content/relay-operations/technical-setup/relays-post-install-and-good-practices/contents.lr index 8373219..5236fbe 100644 --- a/content/relay-operations/technical-setup/relays-post-install-and-good-practices/contents.lr +++ b/content/relay-operations/technical-setup/relays-post-install-and-good-practices/contents.lr @@ -28,8 +28,31 @@ You can search for your relay using your nickname or IP address. It takes some time for relay traffic to ramp up, this is especially true for guard relays but to a lesser extend also for exit relays. To understand this process, read about the [lifecycle of a new relay](https://blog.torproject.org/lifecycle-new-relay). +# 4. Configuration Management -#4. Optional: Limiting bandwidth usage (and traffic) +If you plan to run more than a single relay, or you want to run a high capacity relay (multiple Tor instances per server) or want to use strong security features like [Offline Master Keys](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/Of… without performing additional steps manually, you may want to use a configuration management for better maintainability. + +There are multiple configuration management solutions for Unix based operating systems (Ansible, Puppet, Salt, ...). + +The following Ansible Role has specifically been build for Tor relay operators and supports multiple operating systems: [Ansible Relayor](http://github.com/nusenu/ansible-relayor). + +# 5. Important: if you run more than one Tor instance + +To avoid putting Tor clients at risk when operating multiple relays you must set a proper [MyFamily](https://2019.www.torproject.org/docs/tor-manual.html.en#MyFamily) value and have a valid [ContactInfo](https://2019.www.torproject.org/docs/tor-manual.html.en#Contac… in your torrc configuration. +The MyFamily setting is simply telling Tor clients what Tor relays are controlled by a single entity/operator/organization, so they are not used in multiple positions in a single circuit. + +If you run two relays and they have fingerprints AAAAAAAAAA and BBBBBBBB, you would add the following configuration to set MyFamily: + +``` +MyFamily AAAAAAAAAA,BBBBBBBB +``` + +to both relays. To find your relays fingerprint you can look into the log files when tor starts up or find the file named "fingerprint" in your tor DataDirectory. + +Instead of doing so manually for big operators we recommend to automate the MyFamily setting via a configuration management solution. +Manually managing MyFamily for big relay groups is error prone and can put Tor clients at risk. + +# 6. Optional: Limiting bandwidth usage (and traffic) Tor will not limit its bandwidth usage by default, but supports multiple ways to restrict the used bandwidth and the amount of traffic. This can be handy if you want to ensure that your Tor relay does not exceed a certain amount of bandwidth or total traffic per day/week/month. @@ -44,9 +67,9 @@ The following torrc configuration options can be used to restrict bandwidth and Having a fast relay for some time of the month is preferred over a slow relay for the entire month. -Also see the bandwidth entry in the FAQ: https://www.torproject.org/docs/faq.html.en#BandwidthShaping +Also see the bandwidth entry in the [FAQ](https://www.torproject.org/docs/faq.html.en#BandwidthShaping). -# 5. Check IPv6 availability +# 7. Check IPv6 availability We encourage everyone to enable IPv6 on their relays. This is especially valuable on exit and guard relays. @@ -84,24 +107,7 @@ IPv6Exit 1 Note: Tor requires IPv4 connectivity, you can not run a Tor relay on IPv6-only. -# 6. Important: if you run more than one Tor instance - -To avoid putting Tor clients at risk when operating multiple relays you must set a proper [MyFamily](https://2019.www.torproject.org/docs/tor-manual.html.en#MyFamily) value and have a valid [ContactInfo](https://2019.www.torproject.org/docs/tor-manual.html.en#Contac… in your torrc configuration. -The MyFamily setting is simply telling Tor clients what Tor relays are controlled by a single entity/operator/organization, so they are not used in multiple positions in a single circuit. - -If you run two relays and they have fingerprints AAAAAAAAAA and BBBBBBBB, you would add the following configuration to set MyFamily: - -``` -MyFamily AAAAAAAAAA,BBBBBBBB -``` - -to both relays. To find your relays fingerprint you can look into the log files when tor starts up or find the file named "fingerprint" in your tor DataDirectory. - -Instead of doing so manually for big operators we recommend to automate the MyFamily setting via a configuration management solution. -Manually managing MyFamily for big relaygroups is error prone and can put Tor clients at risk. - - -# 7. Maintaining a relay +# 8. Maintaining a relay ## Backup Tor Identity Keys @@ -116,9 +122,7 @@ Default locations of the keys folder: ## Subscribe to the tor-announce mailing list -This is a very low traffic mailing list and you will get information about new stable tor releases and important security update information. - -* https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce +This is a very low traffic mailing list and you will get information about new stable tor releases and important security update information: [tor-announce](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-ann…. ## Setting up outage notifications

1 0

[community/master] Update and fix broken links in community resources section
by hiro＠torproject.org 08 Jul '19

08 Jul '19

commit 8b84468779ffac746b2e4c81bf8717e867d69181 Author: gus <gus(a)torproject.org> Date: Fri Jul 5 18:26:03 2019 -0400 Update and fix broken links in community resources section --- content/relay-operations/community-resources/contents.lr | 4 ++-- .../community-resources/tor-abuse-templates/contents.lr | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/relay-operations/community-resources/contents.lr b/content/relay-operations/community-resources/contents.lr index e6be9c0..eb905fc 100644 --- a/content/relay-operations/community-resources/contents.lr +++ b/content/relay-operations/community-resources/contents.lr @@ -33,7 +33,7 @@ It is important to respond to abuse complaints in a timely manner (usually withi Other docs we like: * a letter Boing Boing used to respond to a US federal subpoena about their exit relay: [What happened when we got subpoenaed over our Tor exit node](https://boingboing.net/2015/08/04/what-happened-when-the-fbi-sub.html) -* abuse response templates from Coldhak, an organization in Canada that runs multiple relays: [DMCA Template](https://github.com/coldhakca/abuse-templates/blob/master/dmca.tem…, [Genetic Abuse Template](https://github.com/coldhakca/abuse-templates/blob/master/generic.…. +* abuse response templates from Coldhak, an organization in Canada that runs multiple relays: [DMCA Template](https://github.com/coldhakca/abuse-templates/blob/master/dmca.tem…, [Generic Abuse Template](https://github.com/coldhakca/abuse-templates/blob/master/generic.…. # Running a relay with other people @@ -63,5 +63,5 @@ Congratulations, you're officially a Tor relay operator! What now? * There is also more info about running a relay at the [Tor FAQ](https://2019.www.torproject.org/docs/faq.html.en#HowDoIDecide). -* And, most importantly, make sure to email tshirt(a)torproject.org and [claim your swag](https://2019.www.torproject.org/getinvolved/tshirt.html). It's our way of saying thanks for defending privacy and free speech online. +* And, most importantly, make sure to email tshirt(a)torproject.org and [claim your swag](swags). It's our way of saying thanks for defending privacy and free speech online. diff --git a/content/relay-operations/community-resources/tor-abuse-templates/contents.lr b/content/relay-operations/community-resources/tor-abuse-templates/contents.lr index f9952e6..e57afb2 100644 --- a/content/relay-operations/community-resources/tor-abuse-templates/contents.lr +++ b/content/relay-operations/community-resources/tor-abuse-templates/contents.lr @@ -6,7 +6,7 @@ body: # Before You Start -The best way to handle abuse complaints is to set up your exit node so that they are less likely to be sent in the first place. Please see [Tips for Running an Exit Node with Minimal Harassment](https://blog.torproject.org/running-exit-node) and [Tor Exit Guidelines](/tor-exit-guidelines) for more info, before reading this document. +The best way to handle abuse complaints is to set up your exit node so that they are less likely to be sent in the first place. Please see [Tips for Running an Exit Node with Minimal Harassment](https://blog.torproject.org/running-exit-node) and [Tor Exit Guidelines](tor-exit-guidelines) for more info, before reading this document. Below are a collection of letters you can use to respond to your ISP about their complaint in regards to your Tor exit server.

1 0

[community/master] GoodBadISPs - Austria, Bulgaria, Germany, UK, France, Finland, Hungary, Iceland, Italy, Moldova
by hiro＠torproject.org 08 Jul '19

08 Jul '19

commit 843b24e9870413e4d74d00ecea02811493514ae1 Author: gus <gus(a)torproject.org> Date: Sat Jul 6 11:13:33 2019 -0400 GoodBadISPs - Austria, Bulgaria, Germany, UK, France, Finland, Hungary, Iceland, Italy, Moldova --- .../community-resources/good-bad-isps/contents.lr | 118 ++++++++++++++++++++- 1 file changed, 117 insertions(+), 1 deletion(-) diff --git a/content/relay-operations/community-resources/good-bad-isps/contents.lr b/content/relay-operations/community-resources/good-bad-isps/contents.lr index 7384bc1..9e2576e 100644 --- a/content/relay-operations/community-resources/good-bad-isps/contents.lr +++ b/content/relay-operations/community-resources/good-bad-isps/contents.lr @@ -16,7 +16,8 @@ For network diversity and stronger anonymity, you should avoid providers and cou # Good Experiences -## US + +### US | **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | |-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| @@ -66,6 +67,121 @@ For network diversity and stronger anonymity, you should avoid providers and cou +### Austria + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [UPC Austria GmbH](https://www.upc.at/) | - | - | Yes | Yes | (ISP) does not care what their customers do at all (unless you have a business connection) | 12/2011 | +| [Silver Server GmbH](http://sil.at/) | - | -| Yes | Yes | Forwards abuse. Hosts already some big exit/entry nodes which seem to have no problems. Very expensive traffic. | 12/2011 | +| [Tele2 Austria GmbH](https://tele2.at/) | - | - | Yes | Yes | Forwards abuse at business connections, good quality traffic, does not like "proxys" on private lines. Cheap synchronous (SDSL) connections. | 12/2011 | +| [A1(former Telekom Austria)](http://a1.net) | - | - | Yes | No | Does not like Abuse (in any form) at all. Seems to give out customer data at alleged abuse. Not recommended but cheap. | 12/2011 | +| [xpirio GmbH](http://xpirio.at) | - | - | Yes | ? | In general rather relaxed at all services, but better get in touch with their (very understanding) support when you expect abuse. | 12/2011 | + + + +### Bulgaria + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [VPS.BG](https://www.vpsbg.eu/en/) | - | Yes | Yes | Yes | They don't collect any personal info and you can pay in bitcoin. | 01/11/2016 | + + + +### Germany + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Weesly](http://weesly.de) | - | Yes | Yes | Yes | Note that you should let them know about your intention when ordering a server or in advance. | 06/2013 | +| [EUServ](http://euserv.de) | - | - | Yes | No | They have a bad support, but if you know how to maintain your server, this ISP is a good choice. | - | +| [IPX-Server](https://www.ipx-server.de/) | - | Yes | Yes | - | - | - | +| [Keyweb](https://www.keyweb.de/) | - | - | Yes | Yes | - | - | +| [Afterburst](http://afterburst.com) | - | - | Yes | No | - | - | +| [myLoc Managed IT](https://myloc.de) | AS31010, AS24961 | Yes | Yes | No | - | 2018-10-25 | +| [linevast](https://www.linevast.de/) | - | Yes | Yes | Yes | Only allowed on dedicated servers | 13/11/2015 | +| [Server4You](https://www.server4you.de/)| - | Yes | Yes | No | Part of [Intergenia AG](http://www.intergenia.de/)), I've asked Server4You support and they state servers with complaints about Tor will be canceled immediately (see the quote in the "Bad Experience" section) | - | +| [Hetzner](http://hetzner.de/) | - | - | Yes | No | Offers good dedicated root servers for a good price. | +| [Contabo](https://contabo.de) | - | Yes | Yes | Yes | Has no restriction for relays or exit nodes. However, possible abuse complaints will be forwarded to the owner and need to be addressed. | 2018/06 | +| [Strato](https://strato.de) | - | - | Yes | No | Exit-Nodes are prohibited by their general terms and conditions | - | +| [PraHost](https://www.prahost.com/) | - | - | Yes | Yes | Stated in November 2014 that they allow exit nodes if abuse complaints are handled. Suspends the server if no "valid" action (read: blocking) is taken within 24 hours of an abuse ticket. Their ticket system does not reliably handle email replies, use the web interface instead. | 2017-10-31 | +| [DomainFactory](https://www.df.eu/de/cloud-hosting/cloud-server/) | - | - | Yes | No | - | - | +| [NetCologne](https://www.netcologne.de/) | - | - | Yes | Yes | - | - | + + + +### United Kingdom + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Gigatux](https://www.gigatux.com) | - | Yes | Yes | Yes | They actually run their own relay named Gigatux. They also offer servers in the US, Germany, and Israel. | - | +| [Clustered.net](http://www.clustered.net) | - | Yes | Yes | Yes | - | - | +| [Bitfolk](http://bitfolk.com/) | - | Yes | Yes | Yes | They are very knowledgable and understand Tor and its uses. They are hot on spam and abuse so advise changing the default exit (good idea in the UK anyhow). Any DMCA notices received were simply forwarded on without agro | - | +| [RapidSwitch](http://rapidswitch.com/) | - | Yes | Yes | ? | - | 07/2014 | + + + +### France + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Online.net](http://www.online.net/) | AS12876 | Yes | Yes | Yes | The account holder is responsible for all the traffic going through theirs servers.| 01/28/2019 | +| [Gandi VPS](https://www.gandi.net/) | - | Yes | Yes | Yes| Gandi send some abuse complaints to Exit relays, but they do not stop the server, and when you tell them your server is a Tor Exit relay, they say it is OK. They ask Exit relays to use the standard Reduced Exit Policy | - | +| [OVH Kimsufi](http://www.kimsufi.com/) | - | Yes | Yes | No | Changed their TOS in July 2013 and allow Tor as long as they don't notice illegal activities. Exit nodes would eventually be shut down, but relays are allowed. Octave Klaba, CEO of OVH said himself that the TOS have been changed to make them clearer about the use of Tor. Many relays are currently running on Kimsufi servers | - | +| [Digicube](http://www.digicube.fr/) | - | Yes | Yes | Yes | - | - | +| [Pulse Servers](http://www.pulseservers.com/) | - | Yes | Yes | Yes | VPS uses OVH AS. You can build ANY kind tor relays. | 05/01/2016 | + + + +### Finland + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Creanova](http://creanova.org) | AS51765 | Yes | Yes | No | - | 12/19/2018 | +| [TeliaSonera Finland](https://www.sonera.fi/) | AS1759 | Yes | Yes | No | - | 03/26/2016 | + + + +### Hungary + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [ServerAstra](https://serverastra.com/) | AS56322 | Yes | Yes | Yes | They only say you should answer abuse requests in 24h. ISP has re-confirmed by e-mail that exit nodes are acceptable, with "strict" exit node policies. | 2014-10-15 | + + +### Iceland + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [1984Hosting](https://1984hosting.com/) | - | Yes | Yes | Yes | - | - | +| [FlokiNET]https://flokinet.is/) | (AS200651) | Yes | Yes | Yes | Sponsor enn.lu and saveyourprivacy exit nodes | - | +| [orangewebsite](https://www.orangewebsite.com/vps.php) | - | Yes | Yes | Yes? | - | - | + + +### Italy + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Fastweb](https://fastweb.it/) | - | Yes | Yes | Yes | - | - | +| [Prometeus](https://www.prometeus.net/sito/) | - | Yes | Yes | No | - | - | +| [ArubaCloud /Aruba](https://cloud.it/) | - | Yes | Yes | Yes | TOS generically indicate that the operator is responsible for all the activities on the machine. [Read more](https://balist.es/blog/2016/04/18/running-a-tor-exit-node-on-aruba-arubacloud-a-detailed-account/) | - | +| [SelfServer by Enter](https://selfserver.it/) | - | Yes | Yes | Yes | Uncomfortable due to old CentOS 6.10, NATed IPv4-only networking, ports other than the well-known are filtered. Abuse complaints need to go through their support service | 11/2018 | + + + + +### Moldova + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [MivoCloud](https://www.mivocloud.com/) | - | Yes | Yes | No | - | 09/13/16 | +| [Trabia](https://www.trabia.com/) | - | Yes | Yes | Yes | - | 08/13/17 | +| [AlexHost](https://alexhost.md/) | - | Yes | Yes | Yes | - | 07/21/2014 | + + + +### Netherlands + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| --- html: two-columns-page.html

1 0

[community/master] GoodBadISPs - add good isps from all countries.
by hiro＠torproject.org 08 Jul '19

08 Jul '19

commit fd45bf3c3801655fab68d5e82a2d84a1e7d76770 Author: gus <gus(a)torproject.org> Date: Sun Jul 7 11:00:33 2019 -0400 GoodBadISPs - add good isps from all countries. --- .../community-resources/good-bad-isps/contents.lr | 142 ++++++++++++++++++++- 1 file changed, 141 insertions(+), 1 deletion(-) diff --git a/content/relay-operations/community-resources/good-bad-isps/contents.lr b/content/relay-operations/community-resources/good-bad-isps/contents.lr index 9e2576e..c9e52e1 100644 --- a/content/relay-operations/community-resources/good-bad-isps/contents.lr +++ b/content/relay-operations/community-resources/good-bad-isps/contents.lr @@ -12,6 +12,13 @@ Since non-exits do not attract complaints, it should be fine to run them without For network diversity and stronger anonymity, you should avoid providers and countries that already attract a lot of Tor capacity. [Metrics](https://metrics.torproject.org/) is a great tool that allows you to group probabilities by country and AS (autonomous systems), so you can more easily identify networks you want to avoid. + **Try to avoid** the following hosters: + +* OVH SAS (AS16276) +* Online S.a.s. (AS12876) +* Hetzner Online GmbH (AS24940) +* DigitalOcean, LLC (AS14061) + **Note**: This page is currently being revamped. If you would like to help out please see [#31063](https://trac.torproject.org/projects/tor/ticket/31063). # Good Experiences @@ -152,7 +159,7 @@ For network diversity and stronger anonymity, you should avoid providers and cou | **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | |-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| | [1984Hosting](https://1984hosting.com/) | - | Yes | Yes | Yes | - | - | -| [FlokiNET]https://flokinet.is/) | (AS200651) | Yes | Yes | Yes | Sponsor enn.lu and saveyourprivacy exit nodes | - | +| [FlokiNET](https://flokinet.is/) | (AS200651) | Yes | Yes | Yes | Sponsor enn.lu and saveyourprivacy exit nodes | - | | [orangewebsite](https://www.orangewebsite.com/vps.php) | - | Yes | Yes | Yes? | - | - | @@ -182,6 +189,139 @@ For network diversity and stronger anonymity, you should avoid providers and cou | **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | |-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [XS4ALL](https://www.xs4all.nl/en/) | AS3265 | Yes | Yes | Yes | Abuse can result in temporary blocks, therefore they recommend to use an dedicated IP address for exit nodes | 06/16/15 | +| [verelox](https://verelox.com/) | AS12876 | Yes | Yes | Yes | - | 5/16 | +| [HostHatch](https://hosthatch.com/) | AS42708 | Yes | Yes | No | - | 05/01/16 | +| Ziggo | AS9143 | Yes | Yes | Yes | - | 05/24/2016 | +| [LiteServer](https://www.liteserver.nl/) | AS60404 | Yes | Yes | Yes | Can pay with Bitcoin. While their AUP doesn\'t allow tor exit nodes, see here[here](https://www.liteserver.nl/en/acceptable-usage-policy/). They make an exception if your exit-node has a reduced exit policy. And you must leave a note to them that you are running a exit-node. "We allow tor exit nodes as long you run a limited exit policy (block SMTP) to avoid abuse. | 12/26/2018 | +| [i3D](https://www.i3d.net/) | - | Yes | Yes | Yes | Allows also exits, if abuse is handled properly | 08/13/2017 | +| [KoDDoS](https://koddos.net) | AS206264 | Yes | Yes | Yes | Bitcoin accepted. | 10/12/2017 | +| [Worldstream](https://www.worldstream.nl) | AS49981 | Yes | Yes | No | - | 02/06/2019 | +| [LeaseWeb](https://www.leaseweb.com/) | - | Yes | Yes | Yes | - | - | +| [Novogara](http://www.novogara.com) | - | Yes | Yes | Yes | Explicitly allows Tor exit nodes and forwards abuse/DCMA, but their network isn't the most stable. You need to email them for a custom offer. They also accept Bitcoin/UKash/CashU | - | +| [Netrouting`](http://netrouting.nl/) | - | Yes | Yes | No | ISP has confirmed by e-mail that exit nodes are NOT acceptable. | 2014-10-15 | +| [DirectVPS](http://directvps.nl/) | - | Yes | Yes | ? | - | - | +| [Versio](http://versio.nl/) | - | Yes | Yes | No | - | 2013 | +| [CyberBunker](http://www.cyberbunker.com/) | - | Yes | Yes | Yes | Customers can remain anonymous. | - | +| [SnelServer](https://www.snelserver.com/) | - | Yes | Yes | Yes | Abuse complaints must be responded to within 24 hours or the system automatically suspends your account until you do. | 2014 | +| [ChmuraNet](https://www.chmuranet.com/) | - | Yes | Yes | Yes | Allows anonymous users to run tor exits. Abuse issues will be forwarded. Make sure to tell them that you're running an exit | 09/2014 | + + + +### Romania + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [m247.ro](https://www.m247.ro/) | - | Yes | Yes | Yes | - | 12/14/15 | +| [Voxility](http://www.voxility.com/) | - | Yes | Yes | ? | Read more [2015 tor-talk thread](https://lists.torproject.org/pipermail/tor-relays/2015-April/006867… | 04/2015 | +| [JavaPipe](https://javapipe.com/) | - | Yes | Yes | ? | - | 04/2016 | +| [MilesWeb](https://www.milesweb.com/) | - | Yes | Yes | No | Plans in Romania and also have data centers in USA and UK with 24x7 free support. | 03/2017 | + + + +### Sweden + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Dataclub](https://www.dataclub.biz) | - | Yes | Yes | Yes | Your Exit should use Reduced Exit Policy | 2016/06/30 | +| [HostHatch](https://hosthatch.com) | AS42708 | Yes | Yes | No | - | 2016/05 | +| TeliaSonera | - | Yes | Yes | ? | TeliaSonera is also big in Sweden and deliver where other ISPs can't. | - | +| [PRQ](http://prq.se/?p=dedicated&intl=1) | - | Yes | Yes | Yes | - | - | +| [Portlane](http://www.portlane.com/) | - | Yes | Yes | Yes | Previously provided connectivity for ThePirateBay, OpenBitTorrent tracker et al. Handles abuse according to "Swedish praxis". | - | +| [Yourserver](https://www.yourserver.se/) | - | Yes | Yes | ? | Support team will allow relay/exit but TOR Traffic is throttled to 5Mbps speed. If your Exit relay receive too much complaints, they will ask to you to stop or otherwise they will suspend. | 2015/03/06 | + + +### Switzerland + + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Solar Communications Gmbh](https://solarcom.ch/) | AS197988 | Yes | Yes | No | "We allow to place Tor routers, but don't allow to place Tor exit nodes." This applies to all their partners, who actually sell Solar's services to the public, namely: [Server & cloud](https://server-cloud.com), [CoinsHost](https://coinshost.com), [Incloudibly](https://incloudibly.net), [Cloudcom](https://cloudc.me), [AtomDrive](https://atomdrive.net). Cryptocurrencies are accepted. | 12/04/2015 | +| [fsit](http://www.fsit.ch/) | - | Yes | Yes | Yes | - | 11/2015 | + + +### Latvia + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Yourserver](https://www.yourserver.se/) | - | Yes | Yes | ? | Support team will allow relay/exit but TOR Traffic is throttled to 5Mbps speed. If your Exit relay receive too much complaints, they will ask to you to stop or otherwise they will suspend. | 2015/03/06 | + + +### Canada + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [TekSavvy](http://www.teksavvy.ca) | - | Yes | Yes | ? | has a server-friendly Internet Use Policy (e.g., running a Tor relay) and has taken a stand in favor of net neutrality | 2008/12 | +| [CloudatCost.ca](http://www.cloudatcost.com/) | - | Yes | Yes | ? | operated by Fibernetics, has liberal abuse handling policies [AUP](http://www.cloudatcost.com/terms.php), however Tor is not explicitly allowed. | 2015/02 | +| [oneprovider](http://oneprovider.com/) | - | Yes | Yes | Yes | They are reselling dedicated servers in many locations around the world. Abuse handling differs depending on the provider from which they resell. | 2016/06 | + + + +### Slovenia + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Tus Hosting](http://www.tushosting.si/) | - | Yes | Yes | Yes | They just simply forward DMCA notices to us to handle (or ignore) them | - | + + + +### Ukraine +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [UrDN](http://urdn.com.ua) | - | Yes | Yes | Yes | free speech hoster, allows anything but spam/scam. Abuse always forwarded. | 10/08/2015 | +| [Colocall](http://www.colocall.net/) | - | Yes | Yes | Yes | - | - | + + +### Lithuania + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Baltic Servers](http://www.balticservers.com) | - | Yes | Yes | Yes | All abuse mails they got yielded support tickets | - | + + +### New Zealand and Australia + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [HostHatch](https://hosthatch.com/) | AS36351 | Yes | Yes | No | Their VPS location is: Sydney, AU - Equinix IBX SY3 Data Center.Their ISP is:SoftLayer network, which includes primary transit from Telstra and peering with Equinix, Pipe-IX, NSW-IX and Megaport. | - | +| [Rimu hosting](http://rimuhosting.com) | - | Yes | Yes | Yes | Have servers in N.Z.; Sydney; London; and Dallas. Locations may vary, but quite happy with the specific Oz/NZ query. | - | + + + +### Hong Kong +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [hosthatch](https://hosthatch.com/) | AS36351 | Yes | Yes | No | Their Hong Kong VPS type is OpenVZ,and ISP is SoftLayer. VPS locate in Pacnet's data centers, Hong Kong. | - | 05/01/16 | + + +### Czech Republic + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [T-Systems`](http://www.t-systems.cz/) | - | Yes | Yes | ? | - | + + +### Poland + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| [Hitme.net.pl](http://hitme.net.pl/) | - | Yes | Yes | Yes | - | 12/06/2017 | +| [Hostowisko.pl](http://www.hostowisko.pl/) | - | Yes | Yes | ? | - | 27/08/2013 | +| [Exone](http://www.exone.pl/) | - | Yes | Yes | ? | - | 28/08/2013 | +| [e24cloud](http://www.e24cloud.com/en) | - | Yes | Yes | ? | - | 01/10/2013 | +| [hostinger.pl](http://www.hostinger.pl) | - | Yes | Yes | Yes | 02/10/2013 | +| [statnet.pl](http://www.statnet.pl/) | - | No | No | No | Used to allow Tor-relays, but now is blocking Tor activity | 12/06/2017 | +| [IQ PL](http://www.iq.pl/) | - | Yes | Yes | Yes | They allow running exit node on collocated dedicated server | - | +| [Slask DataCenter](https://sldc.eu/) | - | Yes | Yes | Yes | - | 21/02/2018 | + + +### Mexico + +| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | +|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| +| Axtel | - | Yes | Yes | ? | Currently some Guard / Middle nodes are running in Axtel network | 2019 | + + --- html: two-columns-page.html

1 0

[community/master] Add how to get your Tor swags in community resources
by hiro＠torproject.org 08 Jul '19

08 Jul '19

commit e0e57946065e6104cfc8e826f3d63151c78bc559 Author: gus <gus(a)torproject.org> Date: Fri Jul 5 18:29:22 2019 -0400 Add how to get your Tor swags in community resources --- .../community-resources/swags/contents.lr | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/content/relay-operations/community-resources/swags/contents.lr b/content/relay-operations/community-resources/swags/contents.lr new file mode 100644 index 0000000..f8b7c20 --- /dev/null +++ b/content/relay-operations/community-resources/swags/contents.lr @@ -0,0 +1,25 @@ +_model: page +--- +title: Swags +--- +body: + +You can get one of these fine Tor T-shirts for contributing to the Tor project. There are two primary ways of contributing: + +* Operate a fast Tor relay that's been running for the past two months: you are eligible if you allow exits to port 80 and you average 250 KBytes/s traffic, or if you're not an exit but you average 500 KBytes/s traffic. + +* Help out in other ways. Maintain a translation. Run Tor trainings. Write a good support program and get a lot of people to use it. Do research on Tor and anonymity, solve some of our bugs, or establish yourself as a Tor advocate. + +If you're operating a fast relay or you've done something else cool, email us at tshirt(a)torproject.org with the details. (We want to make sure our shirts help outreach happen all around the world, so please understand if we can't send you 5 shirts for your 5 excellent relays.) + +There are a variety of colors, shapes, and sizes available in the great roots design that Leiah Jansen made for us, as well as some older designs. +--- +html: two-columns-page.html +--- +key: 5 +--- +section: Community Resources +--- +section_id: community-resources +--- +subtitle: If you're operating a fast relay or you've done something else cool, you're eligible to receive our swags

1 0

[community/master] Fix link to other guides
by hiro＠torproject.org 08 Jul '19

08 Jul '19

commit ab90ee0b38b4741568903632a2adc1b73d4252ea Author: gus <gus(a)torproject.org> Date: Sun Jul 7 16:53:47 2019 -0400 Fix link to other guides --- .../tor-exit-guidelines/contents.lr | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr b/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr index 37e98d1..a7f098e 100644 --- a/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr +++ b/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr @@ -12,13 +12,13 @@ NOTE: This FAQ is for informational purposes only and does not constitute legal ### Tor at Universities: Find allies. -Find some professors (or deans!) who like the idea of supporting and/or researching anonymity on the Internet. If possible, use an extra IP range whose abuse contact doesn't go through the main university abuse team. Ideally, use addresses that are not trusted by the IP-based authentication many library-related services use -- if the university's entire IP address space is "trusted" to access these library resources, the university is forced to maintain an iron grip on all its addresses. Also read [How do I make my University / ISP / etc happy with my exit node?](FIXME) +Find some professors (or deans!) who like the idea of supporting and/or researching anonymity on the Internet. If possible, use an extra IP range whose abuse contact doesn't go through the main university abuse team. Ideally, use addresses that are not trusted by the IP-based authentication many library-related services use -- if the university's entire IP address space is "trusted" to access these library resources, the university is forced to maintain an iron grip on all its addresses. Also read [How do I make my University / ISP / etc happy with my exit node?](tor-relay-universities) ### Find Tor-friendly ISPs. A good ISP is one that offers cheap bandwidth and is not being used by other members of the Tor community. Before you continue, you may ask the Tor community if your choice is a good one. We very much need diversity, and it does not help if we pool too many exits at one friendly ISP. -In any case, add the ISP to the [GoodBadISPs](FIXME) wiki page. +In any case, add the ISP to the [GoodBadISPs](good-bad-isps) page. To find an ISP, go through forums and sites where ISPs posts their latest deals, and contact them about Tor hosting. Once you identified your ISP, you can follow the two-step advice of TorServers.net. @@ -31,28 +31,28 @@ The two-step process usually helps in elevating your request to higher levels of ## Legal -* Make sure you know the relevant legal paragraphs for common-carrier like communication services in your country (and the country of your hosting provider!). +### Make sure you know the relevant legal paragraphs for common-carrier like communication services in your country (and the country of your hosting provider!). At least most western countries should have regulations that exclude communication service providers from liability. Please add your country's regulations to this list. * USA: [DMCA 512](https://www.law.cornell.edu/uscode/text/17/512); see [EFF's Legal FAQ for Tor Operators](https://2019.www.torproject.org/eff/tor-legal-faq) (a very good and relevant read for other countries as well) - * Germany: [TMG 8](http://www.gesetze-im-internet.de/tmg/__8.html) and [15](http://www.gesetze-im-internet.de/tmg/__15.html). - * Netherlands: [Artikel 6:196c BW](http://wetten.overheid.nl/BWBR0005289/Boek6/Titel3/Afdeling4A/Artikel196c/) - * Austria: [ECG 13](http://www.ris.bka.gv.at/Dokument.wxe?Abfrage=Bundesnormen&Dokumentnummer=NOR40025809) +* Germany: [TMG 8](http://www.gesetze-im-internet.de/tmg/__8.html) and [15](http://www.gesetze-im-internet.de/tmg/__15.html). +* Netherlands: [Artikel 6:196c BW](http://wetten.overheid.nl/BWBR0005289/Boek6/Titel3/Afdeling4A/Artikel196c/) +* Austria: [ECG 13](http://www.ris.bka.gv.at/Dokument.wxe?Abfrage=Bundesnormen&Dokumentnummer=NOR40025809) * France: FIXME - * Sweden: [16-19 2002:562](https://lagen.nu/2002:562#P16S1) +* Sweden: [16-19 2002:562](https://lagen.nu/2002:562#P16S1) If you country is missing here and you know a lawyer who can provide a legal opinion, please get in contact with Tor Project. -* If you're part of an organization that will be running the exit relay (ISP, university etc), consider teaching your legal people about Tor. +### If you're part of an organization that will be running the exit relay (ISP, university etc), consider teaching your legal people about Tor. It's way better for them to hear about Tor from you, in a relaxed environment, than to hear about it from a stranger over the phone. Make them aware of [EFF's Legal FAQ for Tor Operators](https://2019.www.torproject.org/eff/tor-legal-faq). EFF has also offered to talk to other lawyers to explain the legal aspects of Tor; contact us at support(a)torservers.net and we'll make the connections for you. -* If you're not part of an organization, think about starting one! +### If you're not part of an organization, think about starting one! Depending on the chosen form, setting up a legal body might help with liability, and in general it helps to appear bigger than you are (and less likely to get raided). The guys from Torservers.net in Germany found a lawyer who would agree to "host" them inside his office. They are now are a non-profit association ("eingetragener Verein, gemeinnutzig") registered inside a lawyer's office. The setup process was easy and cheap. Similar setups probably exist for your country. Another benefit of an association-like structure is that it might still work even when you leave, if you manage to find successors. -* Consider preemptively teaching your local law enforcement about Tor. +### Consider preemptively teaching your local law enforcement about Tor. "Cybercrime" people actually love it when you offer to [teach them about Tor and the Internet](https://blog.torproject.org/blog/talking-german-police-stuttgart) -- they're typically overwhelmed by their jobs and don't have enough background to know where to start. Contacting them gives you a chance to teach them why Tor is useful to the world (and why it's [not particularly helpful to criminals](https://2019.www.torproject.org/docs/faq-abuse#WhatAboutCriminal…. Also, if they do get a report about your relay, they'll think of you as a helpful expert rather than a potential criminal. @@ -62,13 +62,13 @@ Depending on the chosen form, setting up a legal body might help with liability, If you receive an abuse complaint, don't freak out! Here is some advice for you: -* Answer to abuse complaints in a professional manner within a reasonable time span. +### Answer to abuse complaints in a professional manner within a reasonable time span. TorServers.net is a fairly large Tor exit operator and we receive only a very small number of complaints, especially compared to the amount of traffic we push. Roughly 80% are automated reports, and the rest is usually satisfied with [our default reply](https://www.torservers.net/wiki/abuse/templates). We have not needed the input of a lawyer in many years of operation following the advice on this page. -In addition to the [templates at Torservers.net](https://www.torservers.net/wiki/abuse/templates), you can find many more templates for various scenarios on the [Tor Abuse Templates](FIXME) . It is exceptionally rare to encounter a scenario where none of these templates apply. +In addition to the [templates at Torservers.net](https://www.torservers.net/wiki/abuse/templates), you can find many more templates for various scenarios on the [Tor Abuse Templates](tor-abuse-templates) . It is exceptionally rare to encounter a scenario where none of these templates apply. -* If you receive a threatening letter from a lawyer about abusive use or a DMCA complaint, also don't freak out. +### If you receive a threatening letter from a lawyer about abusive use or a DMCA complaint, also don't freak out. We are not aware of any case that made it near a court, and we will do everything in our power to support you if it does. You can look up if an IP address was listed as an exit relay at a given time at [ExoneraTor](https://exonerator.torproject.org/). Point to that page in your reply to the complaint. If you feel it might be helpful, we can write you a signed letter confirming this information: Contact us at tor-assistants(a)torproject.org if you need one. @@ -76,15 +76,15 @@ In your reply, state clearly that you are not liable for forwarded content passi ## Things you can do preemptively -* Make the WHOIS info point as close to you as possible. +### Make the WHOIS info point as close to you as possible. One of the biggest reasons exit relays disappear is because the people answering the abuse address get nervous and ask you to stop. If you can get your own IP block, great. Even if not, many providers will still reassign subblocks to you if you ask. ARIN uses [SWIP](https://www.arin.net/resources/request/reassignments.html), and RIPE uses something similar. You can also add comments to your range, hinting at your usage as anonymization service ([Example](https://apps.db.ripe.net/search/query.html?searchtext=ZWIEBELFREUN…) If you have questions about the process, please write an email to support(a)torservers.net and we will try to explain the process to you. -* Register a phone number and a fax number as abuse contact. +### Register a phone number and a fax number as abuse contact. At least law enforcement in Germany regularly uses the fax and phone numbers present in IP records. Torservers.net uses a free German fax-to-email service, call-manager.de, and a VoIP number from Sipgate.de. -* Consider using the Reduced Exit Policy. +### Consider using the Reduced Exit Policy. The [Reduced Exit Policy](FIXME) is an alternative to the default exit policy. It allows many Internet services while still blocking the majority of TCP ports. This drastically reduces the odds that a Bittorrent user will select your node and thus reduces or even eliminates the number of [DMCA complaints](https://2019.www.torproject.org/eff/tor-dmca-response) you will receive. @@ -94,7 +94,7 @@ If you have your own experience of abuse handling, just share it on our public m Please read all the technical details before getting started. If you have any questions or need help, please contact us at [tor-relays](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relay…. -* [TorRelayGuide](https://community.torproject.org/relay) +* [TorRelayGuide](https://community.torproject.org/relay-operations) * Set up an informative website on the exit IP(s) on port 80.

1 0

[tor-browser-build/master] FIXUP: recreated 27503.patch against widl sources without dev debug logging
by gk＠torproject.org 08 Jul '19

08 Jul '19

commit 054c4d0f2502698f0803db7574bc0e229a66dfec Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jul 5 13:45:51 2019 -0700 FIXUP: recreated 27503.patch against widl sources without dev debug logging --- projects/mingw-w64/27503.patch | 258 ++++++++++++++--------------------------- 1 file changed, 90 insertions(+), 168 deletions(-) diff --git a/projects/mingw-w64/27503.patch b/projects/mingw-w64/27503.patch index f6bd197..ca542d0 100644 --- a/projects/mingw-w64/27503.patch +++ b/projects/mingw-w64/27503.patch @@ -1161,7 +1161,7 @@ index 0d44b403..0e62f77c 100644 return 1; return 0; diff --git a/mingw-w64-tools/widl/src/parser.tab.c b/mingw-w64-tools/widl/src/parser.tab.c -index 6266e054..d7053e79 100644 +index 6266e054..8cd1605a 100644 --- a/mingw-w64-tools/widl/src/parser.tab.c +++ b/mingw-w64-tools/widl/src/parser.tab.c @@ -1,8 +1,8 @@ @@ -4829,7 +4829,7 @@ index 6266e054..d7053e79 100644 int top) { var_t *v = decl->var; -@@ -5638,58 +5685,80 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -5638,58 +5685,74 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl expr_t *dim; type_t **ptype; type_t *func_type = decl ? decl->func_type : NULL; @@ -4912,12 +4912,6 @@ index 6266e054..d7053e79 100644 - if (!ptr_attr && top && (*pt)->details.pointer.def_fc != FC_RP) + if (!ptr_attr && top && type_pointer_get_default_fc(*pt) != FC_RP) { -+ printf("dup_pointer_type!\n"); -+ printf("type : %p name : %s\n", *pt, (*pt)->name); -+ /* ptr_attr is ref,unique or full (FC_RP, FC_UP, FC_FP) */ -+ /* *pt could be the var's declspec's type OR a type on a typedef */ -+ /* not an array */ -+ /* FIXME: this is a horrible hack to cope with the issue that we * store an offset to the typeformat string in the type object, but * two typeformat strings may be written depending on whether the @@ -4927,7 +4921,7 @@ index 6266e054..d7053e79 100644 } } else if (ptr_attr) -@@ -5700,16 +5769,16 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -5700,16 +5763,16 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl { type_t *t = type; @@ -4947,7 +4941,7 @@ index 6266e054..d7053e79 100644 else break; } -@@ -5726,15 +5795,15 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -5726,15 +5789,15 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl if (is_attr(v->attrs, ATTR_V1ENUM)) { @@ -4966,7 +4960,7 @@ index 6266e054..d7053e79 100644 if (sizes) LIST_FOR_EACH_ENTRY(dim, sizes, expr_t, entry) { if (dim->type != EXPR_VOID) -@@ -5747,7 +5816,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -5747,7 +5810,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl else *ptype = type_new_array((*ptype)->name, type_array_get_element(*ptype), FALSE, @@ -4975,7 +4969,7 @@ index 6266e054..d7053e79 100644 } else if (is_ptr(*ptype)) *ptype = type_new_array((*ptype)->name, type_pointer_get_ref(*ptype), TRUE, -@@ -5756,15 +5825,16 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -5756,15 +5819,16 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl error_loc("%s: size_is attribute applied to illegal type\n", v->name); } @@ -4995,7 +4989,7 @@ index 6266e054..d7053e79 100644 if (lengs) LIST_FOR_EACH_ENTRY(dim, lengs, expr_t, entry) { if (dim->type != EXPR_VOID) -@@ -5782,10 +5852,11 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -5782,10 +5846,11 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl error_loc("%s: length_is attribute applied to illegal type\n", v->name); } @@ -5009,7 +5003,7 @@ index 6266e054..d7053e79 100644 else error_loc("%s: too many expressions in length_is attribute\n", v->name); } -@@ -5796,29 +5867,31 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -5796,29 +5861,31 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl if (func_type) { type_t *ft, *t; @@ -5050,7 +5044,7 @@ index 6266e054..d7053e79 100644 return v; } -@@ -5866,6 +5939,10 @@ var_list_t *append_var(var_list_t *list, var_t *var) +@@ -5866,6 +5933,10 @@ var_list_t *append_var(var_list_t *list, var_t *var) list_init( list ); } list_add_tail( list, &var->entry ); @@ -5061,7 +5055,7 @@ index 6266e054..d7053e79 100644 return list; } -@@ -5885,11 +5962,11 @@ var_t *make_var(char *name) +@@ -5885,11 +5956,11 @@ var_t *make_var(char *name) { var_t *v = xmalloc(sizeof(var_t)); v->name = name; @@ -5075,7 +5069,7 @@ index 6266e054..d7053e79 100644 return v; } -@@ -5897,10 +5974,9 @@ static var_t *copy_var(var_t *src, char *name, map_attrs_filter_t attr_filter) +@@ -5897,10 +5968,9 @@ static var_t *copy_var(var_t *src, char *name, map_attrs_filter_t attr_filter) { var_t *v = xmalloc(sizeof(var_t)); v->name = name; @@ -5087,7 +5081,7 @@ index 6266e054..d7053e79 100644 v->loc_info = src->loc_info; return v; } -@@ -5920,7 +5996,7 @@ static declarator_t *make_declarator(var_t *var) +@@ -5920,7 +5990,7 @@ static declarator_t *make_declarator(var_t *var) { declarator_t *d = xmalloc(sizeof(*d)); d->var = var ? var : make_var(NULL); @@ -5096,7 +5090,7 @@ index 6266e054..d7053e79 100644 d->func_type = NULL; d->bits = NULL; return d; -@@ -5928,7 +6004,15 @@ static declarator_t *make_declarator(var_t *var) +@@ -5928,7 +5998,15 @@ static declarator_t *make_declarator(var_t *var) static type_t *make_safearray(type_t *type) { @@ -5113,16 +5107,7 @@ index 6266e054..d7053e79 100644 NULL, NULL, FC_RP); } -@@ -6007,6 +6091,8 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in - } - if (!namespace) - namespace = &global_namespace; -+ printf("reg_type { name : %s, namespace : %s, type : %s, ptr : %p}\n", name, namespace->name, ts_to_str(t), type); -+ - hash = hash_ident(name); - nt = xmalloc(sizeof(struct rtype)); - nt->name = name; -@@ -6018,15 +6104,16 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in +@@ -6018,15 +6096,16 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in nt->t = t; nt->next = namespace->type_hash[hash]; namespace->type_hash[hash] = nt; @@ -5142,7 +5127,7 @@ index 6266e054..d7053e79 100644 type_get_type_detect_alias(t) == TYPE_UNION || type_get_type_detect_alias(t) == TYPE_ENCAPSULATED_UNION); } -@@ -6034,19 +6121,16 @@ static int is_incomplete(const type_t *t) +@@ -6034,19 +6113,16 @@ static int is_incomplete(const type_t *t) void add_incomplete(type_t *t) { struct typenode *tn = xmalloc(sizeof *tn); @@ -5166,7 +5151,7 @@ index 6266e054..d7053e79 100644 t->defined = ot->defined; } } -@@ -6070,7 +6154,7 @@ static void fix_incomplete_types(type_t *complete_type) +@@ -6070,7 +6146,7 @@ static void fix_incomplete_types(type_t *complete_type) { if (type_is_equal(complete_type, tn->type)) { @@ -5175,7 +5160,7 @@ index 6266e054..d7053e79 100644 list_remove(&tn->entry); free(tn); } -@@ -6094,7 +6178,13 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at +@@ -6094,7 +6170,13 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) { if (!type->name) @@ -5189,13 +5174,7 @@ index 6266e054..d7053e79 100644 /* replace existing attributes when generating a typelib */ if (do_typelib) -@@ -6120,12 +6210,12 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at - * for cleaner solution. - */ - if (cur && input_name == cur->loc_info.input_name) -- error_loc("%s: redefinition error; original definition was at %s:%d\n", -+ error_loc("FOO %s: redefinition error; original definition was at %s:%d\n", - cur->name, cur->loc_info.input_name, +@@ -6125,7 +6207,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at cur->loc_info.line_number); name = declare_var(attrs, decl_spec, decl, 0); @@ -5204,16 +5183,7 @@ index 6266e054..d7053e79 100644 cur->attrs = attrs; if (is_incomplete(cur)) -@@ -6140,6 +6230,8 @@ type_t *find_type(const char *name, struct namespace *namespace, int t) - { - struct rtype *cur; - -+ printf("find_type { name : %s, namespace %s, type : %s }\n", name, namespace ? namespace->name : NULL, ts_to_str(t)); -+ - if(namespace && namespace != &global_namespace) { - for(cur = namespace->type_hash[hash_ident(name)]; cur; cur = cur->next) { - if(cur->t == t && !strcmp(cur->name, name)) -@@ -6293,7 +6385,6 @@ struct allowed_attr allowed_attr[] = +@@ -6293,7 +6375,6 @@ struct allowed_attr allowed_attr[] = /* ATTR_CASE */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "case" }, /* ATTR_CODE */ { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "code" }, /* ATTR_COMMSTATUS */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, @@ -5221,7 +5191,7 @@ index 6266e054..d7053e79 100644 /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "control" }, /* ATTR_DECODE */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, -@@ -6328,7 +6419,6 @@ struct allowed_attr allowed_attr[] = +@@ -6328,7 +6409,6 @@ struct allowed_attr allowed_attr[] = /* ATTR_IMMEDIATEBIND */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "immediatebind" }, /* ATTR_IMPLICIT_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "implicit_handle" }, /* ATTR_IN */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "in" }, @@ -5229,7 +5199,7 @@ index 6266e054..d7053e79 100644 /* ATTR_INPUTSYNC */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, "length_is" }, /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "lcid" }, -@@ -6400,10 +6490,10 @@ static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs) +@@ -6400,10 +6480,10 @@ static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs) if (attr->type == ATTR_IMPLICIT_HANDLE) { const var_t *var = attr->u.pval; @@ -5243,7 +5213,7 @@ index 6266e054..d7053e79 100644 continue; error_loc("attribute %s requires a handle type in interface %s\n", allowed_attr[attr->type].display_name, name); -@@ -6608,7 +6698,7 @@ static int is_ptr_guid_type(const type_t *type) +@@ -6608,7 +6688,7 @@ static int is_ptr_guid_type(const type_t *type) /* second, make sure it is a pointer to something of size sizeof(GUID), * i.e. 16 bytes */ @@ -5252,7 +5222,7 @@ index 6266e054..d7053e79 100644 } static void check_conformance_expr_list(const char *attr_name, const var_t *arg, const type_t *container_type, expr_list_t *expr_list) -@@ -6635,7 +6725,7 @@ static void check_remoting_fields(const var_t *var, type_t *type); +@@ -6635,7 +6715,7 @@ static void check_remoting_fields(const var_t *var, type_t *type); static void check_field_common(const type_t *container_type, const char *container_name, const var_t *arg) { @@ -5261,7 +5231,7 @@ index 6266e054..d7053e79 100644 int more_to_do; const char *container_type_name; const char *var_type; -@@ -6665,7 +6755,7 @@ static void check_field_common(const type_t *container_type, +@@ -6665,7 +6745,7 @@ static void check_field_common(const type_t *container_type, } if (is_attr(arg->attrs, ATTR_LENGTHIS) && @@ -5270,7 +5240,7 @@ index 6266e054..d7053e79 100644 error_loc_info(&arg->loc_info, "string and length_is specified for argument %s are mutually exclusive attributes\n", arg->name); -@@ -6762,23 +6852,28 @@ static void check_field_common(const type_t *container_type, +@@ -6762,23 +6842,28 @@ static void check_field_common(const type_t *container_type, { const type_t *t = type; while (is_ptr(t)) @@ -5303,7 +5273,7 @@ index 6266e054..d7053e79 100644 case TGT_RANGE: /* nothing to do */ break; -@@ -6803,13 +6898,18 @@ static void check_remoting_fields(const var_t *var, type_t *type) +@@ -6803,13 +6888,18 @@ static void check_remoting_fields(const var_t *var, type_t *type) if (type_is_complete(type)) fields = type_struct_get_fields(type); else @@ -5325,7 +5295,7 @@ index 6266e054..d7053e79 100644 } /* checks that arguments for a function make sense for marshalling and unmarshalling */ -@@ -6818,9 +6918,10 @@ static void check_remoting_args(const var_t *func) +@@ -6818,9 +6908,10 @@ static void check_remoting_args(const var_t *func) const char *funcname = func->name; const var_t *arg; @@ -5338,7 +5308,7 @@ index 6266e054..d7053e79 100644 /* check that [out] parameters have enough pointer levels */ if (is_attr(arg->attrs, ATTR_OUT)) -@@ -6860,16 +6961,16 @@ static void check_remoting_args(const var_t *func) +@@ -6860,16 +6951,16 @@ static void check_remoting_args(const var_t *func) } } @@ -5359,7 +5329,7 @@ index 6266e054..d7053e79 100644 free(var.name); } } -@@ -6886,8 +6987,8 @@ static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func) +@@ -6886,8 +6977,8 @@ static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func) * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); @@ -5370,7 +5340,7 @@ index 6266e054..d7053e79 100644 } } -@@ -6952,6 +7053,7 @@ static void check_async_uuid(type_t *iface) +@@ -6952,6 +7043,7 @@ static void check_async_uuid(type_t *iface) type_t *async_iface; type_t *inherit; @@ -5378,7 +5348,7 @@ index 6266e054..d7053e79 100644 if (!is_attr(iface->attrs, ATTR_ASYNCUUID)) return; inherit = iface->details.iface->inherit; -@@ -6968,7 +7070,8 @@ static void check_async_uuid(type_t *iface) +@@ -6968,7 +7060,8 @@ static void check_async_uuid(type_t *iface) var_t *begin_func, *finish_func, *func = stmt->u.var, *arg; var_list_t *begin_args = NULL, *finish_args = NULL, *args; @@ -5388,7 +5358,7 @@ index 6266e054..d7053e79 100644 if (args) LIST_FOR_EACH_ENTRY(arg, args, var_t, entry) { if (is_attr(arg->attrs, ATTR_IN) || !is_attr(arg->attrs, ATTR_OUT)) -@@ -6978,15 +7081,15 @@ static void check_async_uuid(type_t *iface) +@@ -6978,15 +7071,15 @@ static void check_async_uuid(type_t *iface) } begin_func = copy_var(func, concat_str("Begin_", func->name), NULL); @@ -5410,7 +5380,7 @@ index 6266e054..d7053e79 100644 stmts = append_statement(stmts, make_statement_declaration(finish_func)); } -@@ -7026,6 +7129,7 @@ static void check_statements(const statement_list_t *stmts, int is_inside_librar +@@ -7026,6 +7119,7 @@ static void check_statements(const statement_list_t *stmts, int is_inside_librar static void check_all_user_types(const statement_list_t *stmts) { const statement_t *stmt; @@ -5418,7 +5388,7 @@ index 6266e054..d7053e79 100644 if (stmts) LIST_FOR_EACH_ENTRY(stmt, stmts, const statement_t, entry) { -@@ -7037,7 +7141,11 @@ static void check_all_user_types(const statement_list_t *stmts) +@@ -7037,7 +7131,11 @@ static void check_all_user_types(const statement_list_t *stmts) const statement_t *stmt_func; STATEMENTS_FOR_EACH_FUNC(stmt_func, type_iface_get_stmts(stmt->u.type)) { const var_t *func = stmt_func->u.var; @@ -5431,7 +5401,7 @@ index 6266e054..d7053e79 100644 } } } -@@ -7071,6 +7179,10 @@ static statement_t *make_statement_type_decl(type_t *type) +@@ -7071,6 +7169,10 @@ static statement_t *make_statement_type_decl(type_t *type) { statement_t *stmt = make_statement(STMT_TYPE); stmt->u.type = type; @@ -5442,7 +5412,7 @@ index 6266e054..d7053e79 100644 return stmt; } -@@ -7085,16 +7197,16 @@ static statement_t *make_statement_declaration(var_t *var) +@@ -7085,16 +7187,16 @@ static statement_t *make_statement_declaration(var_t *var) { statement_t *stmt = make_statement(STMT_DECLARATION); stmt->u.var = var; @@ -5462,7 +5432,7 @@ index 6266e054..d7053e79 100644 error_loc("instantiation of data is illegal\n"); return stmt; } -@@ -7146,6 +7258,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) +@@ -7146,6 +7248,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) declarator_t *decl, *next; statement_t *stmt; type_list_t **type_list; @@ -5470,7 +5440,7 @@ index 6266e054..d7053e79 100644 if (!decls) return NULL; -@@ -7157,6 +7270,18 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) +@@ -7157,6 +7260,18 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) { var_t *var = decl->var; type_t *type = find_type_or_error(var->name, 0); @@ -5489,7 +5459,7 @@ index 6266e054..d7053e79 100644 *type_list = xmalloc(sizeof(type_list_t)); (*type_list)->type = type; (*type_list)->next = NULL; -@@ -7166,6 +7291,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) +@@ -7166,6 +7281,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) free(var); } @@ -5497,14 +5467,13 @@ index 6266e054..d7053e79 100644 return stmt; } -@@ -7206,7 +7332,7 @@ void init_loc_info(loc_info_t *i) +@@ -7206,7 +7322,7 @@ void init_loc_info(loc_info_t *i) static void check_def(const type_t *t) { - if (t->defined) -- error_loc("%s: redefinition error; original definition was at %s:%d\n", + if (type_is_defined(t)) -+ error_loc("BAR %s: redefinition error; original definition was at %s:%d\n", + error_loc("%s: redefinition error; original definition was at %s:%d\n", t->name, t->loc_info.input_name, t->loc_info.line_number); } diff --git a/mingw-w64-tools/widl/src/parser.tab.h b/mingw-w64-tools/widl/src/parser.tab.h @@ -5544,7 +5513,7 @@ index 09874726..fc7a8f4d 100644 typedef union YYSTYPE YYSTYPE; diff --git a/mingw-w64-tools/widl/src/parser.y b/mingw-w64-tools/widl/src/parser.y -index d9793941..bb14bf76 100644 +index d9793941..64503ac1 100644 --- a/mingw-w64-tools/widl/src/parser.y +++ b/mingw-w64-tools/widl/src/parser.y @@ -52,13 +52,6 @@ struct _import_t @@ -6008,7 +5977,7 @@ index d9793941..bb14bf76 100644 int top) { var_t *v = decl->var; -@@ -1523,58 +1573,80 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -1523,58 +1573,74 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl expr_t *dim; type_t **ptype; type_t *func_type = decl ? decl->func_type : NULL; @@ -6091,12 +6060,6 @@ index d9793941..bb14bf76 100644 - if (!ptr_attr && top && (*pt)->details.pointer.def_fc != FC_RP) + if (!ptr_attr && top && type_pointer_get_default_fc(*pt) != FC_RP) { -+ printf("dup_pointer_type!\n"); -+ printf("type : %p name : %s\n", *pt, (*pt)->name); -+ /* ptr_attr is ref,unique or full (FC_RP, FC_UP, FC_FP) */ -+ /* *pt could be the var's declspec's type OR a type on a typedef */ -+ /* not an array */ -+ /* FIXME: this is a horrible hack to cope with the issue that we * store an offset to the typeformat string in the type object, but * two typeformat strings may be written depending on whether the @@ -6106,7 +6069,7 @@ index d9793941..bb14bf76 100644 } } else if (ptr_attr) -@@ -1585,16 +1657,16 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -1585,16 +1651,16 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl { type_t *t = type; @@ -6126,7 +6089,7 @@ index d9793941..bb14bf76 100644 else break; } -@@ -1611,15 +1683,15 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -1611,15 +1677,15 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl if (is_attr(v->attrs, ATTR_V1ENUM)) { @@ -6145,7 +6108,7 @@ index d9793941..bb14bf76 100644 if (sizes) LIST_FOR_EACH_ENTRY(dim, sizes, expr_t, entry) { if (dim->type != EXPR_VOID) -@@ -1632,7 +1704,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -1632,7 +1698,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl else *ptype = type_new_array((*ptype)->name, type_array_get_element(*ptype), FALSE, @@ -6154,7 +6117,7 @@ index d9793941..bb14bf76 100644 } else if (is_ptr(*ptype)) *ptype = type_new_array((*ptype)->name, type_pointer_get_ref(*ptype), TRUE, -@@ -1641,15 +1713,16 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -1641,15 +1707,16 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl error_loc("%s: size_is attribute applied to illegal type\n", v->name); } @@ -6174,7 +6137,7 @@ index d9793941..bb14bf76 100644 if (lengs) LIST_FOR_EACH_ENTRY(dim, lengs, expr_t, entry) { if (dim->type != EXPR_VOID) -@@ -1667,10 +1740,11 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -1667,10 +1734,11 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl error_loc("%s: length_is attribute applied to illegal type\n", v->name); } @@ -6188,7 +6151,7 @@ index d9793941..bb14bf76 100644 else error_loc("%s: too many expressions in length_is attribute\n", v->name); } -@@ -1681,29 +1755,31 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl +@@ -1681,29 +1749,31 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl if (func_type) { type_t *ft, *t; @@ -6229,7 +6192,7 @@ index d9793941..bb14bf76 100644 return v; } -@@ -1751,6 +1827,10 @@ var_list_t *append_var(var_list_t *list, var_t *var) +@@ -1751,6 +1821,10 @@ var_list_t *append_var(var_list_t *list, var_t *var) list_init( list ); } list_add_tail( list, &var->entry ); @@ -6240,7 +6203,7 @@ index d9793941..bb14bf76 100644 return list; } -@@ -1770,11 +1850,11 @@ var_t *make_var(char *name) +@@ -1770,11 +1844,11 @@ var_t *make_var(char *name) { var_t *v = xmalloc(sizeof(var_t)); v->name = name; @@ -6254,7 +6217,7 @@ index d9793941..bb14bf76 100644 return v; } -@@ -1782,10 +1862,9 @@ static var_t *copy_var(var_t *src, char *name, map_attrs_filter_t attr_filter) +@@ -1782,10 +1856,9 @@ static var_t *copy_var(var_t *src, char *name, map_attrs_filter_t attr_filter) { var_t *v = xmalloc(sizeof(var_t)); v->name = name; @@ -6266,7 +6229,7 @@ index d9793941..bb14bf76 100644 v->loc_info = src->loc_info; return v; } -@@ -1805,7 +1884,7 @@ static declarator_t *make_declarator(var_t *var) +@@ -1805,7 +1878,7 @@ static declarator_t *make_declarator(var_t *var) { declarator_t *d = xmalloc(sizeof(*d)); d->var = var ? var : make_var(NULL); @@ -6275,7 +6238,7 @@ index d9793941..bb14bf76 100644 d->func_type = NULL; d->bits = NULL; return d; -@@ -1813,7 +1892,15 @@ static declarator_t *make_declarator(var_t *var) +@@ -1813,7 +1886,15 @@ static declarator_t *make_declarator(var_t *var) static type_t *make_safearray(type_t *type) { @@ -6292,16 +6255,7 @@ index d9793941..bb14bf76 100644 NULL, NULL, FC_RP); } -@@ -1892,6 +1979,8 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in - } - if (!namespace) - namespace = &global_namespace; -+ printf("reg_type { name : %s, namespace : %s, type : %s, ptr : %p}\n", name, namespace->name, ts_to_str(t), type); -+ - hash = hash_ident(name); - nt = xmalloc(sizeof(struct rtype)); - nt->name = name; -@@ -1903,15 +1992,16 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in +@@ -1903,15 +1984,16 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in nt->t = t; nt->next = namespace->type_hash[hash]; namespace->type_hash[hash] = nt; @@ -6321,7 +6275,7 @@ index d9793941..bb14bf76 100644 type_get_type_detect_alias(t) == TYPE_UNION || type_get_type_detect_alias(t) == TYPE_ENCAPSULATED_UNION); } -@@ -1919,19 +2009,16 @@ static int is_incomplete(const type_t *t) +@@ -1919,19 +2001,16 @@ static int is_incomplete(const type_t *t) void add_incomplete(type_t *t) { struct typenode *tn = xmalloc(sizeof *tn); @@ -6345,7 +6299,7 @@ index d9793941..bb14bf76 100644 t->defined = ot->defined; } } -@@ -1955,7 +2042,7 @@ static void fix_incomplete_types(type_t *complete_type) +@@ -1955,7 +2034,7 @@ static void fix_incomplete_types(type_t *complete_type) { if (type_is_equal(complete_type, tn->type)) { @@ -6354,7 +6308,7 @@ index d9793941..bb14bf76 100644 list_remove(&tn->entry); free(tn); } -@@ -1979,7 +2066,13 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at +@@ -1979,7 +2058,13 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) { if (!type->name) @@ -6368,13 +6322,7 @@ index d9793941..bb14bf76 100644 /* replace existing attributes when generating a typelib */ if (do_typelib) -@@ -2005,12 +2098,12 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at - * for cleaner solution. - */ - if (cur && input_name == cur->loc_info.input_name) -- error_loc("%s: redefinition error; original definition was at %s:%d\n", -+ error_loc("FOO %s: redefinition error; original definition was at %s:%d\n", - cur->name, cur->loc_info.input_name, +@@ -2010,7 +2095,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at cur->loc_info.line_number); name = declare_var(attrs, decl_spec, decl, 0); @@ -6383,16 +6331,7 @@ index d9793941..bb14bf76 100644 cur->attrs = attrs; if (is_incomplete(cur)) -@@ -2025,6 +2118,8 @@ type_t *find_type(const char *name, struct namespace *namespace, int t) - { - struct rtype *cur; - -+ printf("find_type { name : %s, namespace %s, type : %s }\n", name, namespace ? namespace->name : NULL, ts_to_str(t)); -+ - if(namespace && namespace != &global_namespace) { - for(cur = namespace->type_hash[hash_ident(name)]; cur; cur = cur->next) { - if(cur->t == t && !strcmp(cur->name, name)) -@@ -2178,7 +2273,6 @@ struct allowed_attr allowed_attr[] = +@@ -2178,7 +2263,6 @@ struct allowed_attr allowed_attr[] = /* ATTR_CASE */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "case" }, /* ATTR_CODE */ { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "code" }, /* ATTR_COMMSTATUS */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, @@ -6400,7 +6339,7 @@ index d9793941..bb14bf76 100644 /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "control" }, /* ATTR_DECODE */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, -@@ -2213,7 +2307,6 @@ struct allowed_attr allowed_attr[] = +@@ -2213,7 +2297,6 @@ struct allowed_attr allowed_attr[] = /* ATTR_IMMEDIATEBIND */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "immediatebind" }, /* ATTR_IMPLICIT_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "implicit_handle" }, /* ATTR_IN */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "in" }, @@ -6408,7 +6347,7 @@ index d9793941..bb14bf76 100644 /* ATTR_INPUTSYNC */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, "length_is" }, /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "lcid" }, -@@ -2285,10 +2378,10 @@ static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs) +@@ -2285,10 +2368,10 @@ static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs) if (attr->type == ATTR_IMPLICIT_HANDLE) { const var_t *var = attr->u.pval; @@ -6422,7 +6361,7 @@ index d9793941..bb14bf76 100644 continue; error_loc("attribute %s requires a handle type in interface %s\n", allowed_attr[attr->type].display_name, name); -@@ -2493,7 +2586,7 @@ static int is_ptr_guid_type(const type_t *type) +@@ -2493,7 +2576,7 @@ static int is_ptr_guid_type(const type_t *type) /* second, make sure it is a pointer to something of size sizeof(GUID), * i.e. 16 bytes */ @@ -6431,7 +6370,7 @@ index d9793941..bb14bf76 100644 } static void check_conformance_expr_list(const char *attr_name, const var_t *arg, const type_t *container_type, expr_list_t *expr_list) -@@ -2520,7 +2613,7 @@ static void check_remoting_fields(const var_t *var, type_t *type); +@@ -2520,7 +2603,7 @@ static void check_remoting_fields(const var_t *var, type_t *type); static void check_field_common(const type_t *container_type, const char *container_name, const var_t *arg) { @@ -6440,7 +6379,7 @@ index d9793941..bb14bf76 100644 int more_to_do; const char *container_type_name; const char *var_type; -@@ -2550,7 +2643,7 @@ static void check_field_common(const type_t *container_type, +@@ -2550,7 +2633,7 @@ static void check_field_common(const type_t *container_type, } if (is_attr(arg->attrs, ATTR_LENGTHIS) && @@ -6449,7 +6388,7 @@ index d9793941..bb14bf76 100644 error_loc_info(&arg->loc_info, "string and length_is specified for argument %s are mutually exclusive attributes\n", arg->name); -@@ -2647,23 +2740,28 @@ static void check_field_common(const type_t *container_type, +@@ -2647,23 +2730,28 @@ static void check_field_common(const type_t *container_type, { const type_t *t = type; while (is_ptr(t)) @@ -6482,7 +6421,7 @@ index d9793941..bb14bf76 100644 case TGT_RANGE: /* nothing to do */ break; -@@ -2688,13 +2786,18 @@ static void check_remoting_fields(const var_t *var, type_t *type) +@@ -2688,13 +2776,18 @@ static void check_remoting_fields(const var_t *var, type_t *type) if (type_is_complete(type)) fields = type_struct_get_fields(type); else @@ -6504,7 +6443,7 @@ index d9793941..bb14bf76 100644 } /* checks that arguments for a function make sense for marshalling and unmarshalling */ -@@ -2703,9 +2806,10 @@ static void check_remoting_args(const var_t *func) +@@ -2703,9 +2796,10 @@ static void check_remoting_args(const var_t *func) const char *funcname = func->name; const var_t *arg; @@ -6517,7 +6456,7 @@ index d9793941..bb14bf76 100644 /* check that [out] parameters have enough pointer levels */ if (is_attr(arg->attrs, ATTR_OUT)) -@@ -2745,16 +2849,16 @@ static void check_remoting_args(const var_t *func) +@@ -2745,16 +2839,16 @@ static void check_remoting_args(const var_t *func) } } @@ -6538,7 +6477,7 @@ index d9793941..bb14bf76 100644 free(var.name); } } -@@ -2771,8 +2875,8 @@ static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func) +@@ -2771,8 +2865,8 @@ static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func) * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); @@ -6549,7 +6488,7 @@ index d9793941..bb14bf76 100644 } } -@@ -2837,6 +2941,7 @@ static void check_async_uuid(type_t *iface) +@@ -2837,6 +2931,7 @@ static void check_async_uuid(type_t *iface) type_t *async_iface; type_t *inherit; @@ -6557,7 +6496,7 @@ index d9793941..bb14bf76 100644 if (!is_attr(iface->attrs, ATTR_ASYNCUUID)) return; inherit = iface->details.iface->inherit; -@@ -2853,7 +2958,8 @@ static void check_async_uuid(type_t *iface) +@@ -2853,7 +2948,8 @@ static void check_async_uuid(type_t *iface) var_t *begin_func, *finish_func, *func = stmt->u.var, *arg; var_list_t *begin_args = NULL, *finish_args = NULL, *args; @@ -6567,7 +6506,7 @@ index d9793941..bb14bf76 100644 if (args) LIST_FOR_EACH_ENTRY(arg, args, var_t, entry) { if (is_attr(arg->attrs, ATTR_IN) || !is_attr(arg->attrs, ATTR_OUT)) -@@ -2863,15 +2969,15 @@ static void check_async_uuid(type_t *iface) +@@ -2863,15 +2959,15 @@ static void check_async_uuid(type_t *iface) } begin_func = copy_var(func, concat_str("Begin_", func->name), NULL); @@ -6589,7 +6528,7 @@ index d9793941..bb14bf76 100644 stmts = append_statement(stmts, make_statement_declaration(finish_func)); } -@@ -2911,6 +3017,7 @@ static void check_statements(const statement_list_t *stmts, int is_inside_librar +@@ -2911,6 +3007,7 @@ static void check_statements(const statement_list_t *stmts, int is_inside_librar static void check_all_user_types(const statement_list_t *stmts) { const statement_t *stmt; @@ -6597,7 +6536,7 @@ index d9793941..bb14bf76 100644 if (stmts) LIST_FOR_EACH_ENTRY(stmt, stmts, const statement_t, entry) { -@@ -2922,7 +3029,11 @@ static void check_all_user_types(const statement_list_t *stmts) +@@ -2922,7 +3019,11 @@ static void check_all_user_types(const statement_list_t *stmts) const statement_t *stmt_func; STATEMENTS_FOR_EACH_FUNC(stmt_func, type_iface_get_stmts(stmt->u.type)) { const var_t *func = stmt_func->u.var; @@ -6610,7 +6549,7 @@ index d9793941..bb14bf76 100644 } } } -@@ -2956,6 +3067,10 @@ static statement_t *make_statement_type_decl(type_t *type) +@@ -2956,6 +3057,10 @@ static statement_t *make_statement_type_decl(type_t *type) { statement_t *stmt = make_statement(STMT_TYPE); stmt->u.type = type; @@ -6621,7 +6560,7 @@ index d9793941..bb14bf76 100644 return stmt; } -@@ -2970,16 +3085,16 @@ static statement_t *make_statement_declaration(var_t *var) +@@ -2970,16 +3075,16 @@ static statement_t *make_statement_declaration(var_t *var) { statement_t *stmt = make_statement(STMT_DECLARATION); stmt->u.var = var; @@ -6641,7 +6580,7 @@ index d9793941..bb14bf76 100644 error_loc("instantiation of data is illegal\n"); return stmt; } -@@ -3031,6 +3146,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) +@@ -3031,6 +3136,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) declarator_t *decl, *next; statement_t *stmt; type_list_t **type_list; @@ -6649,7 +6588,7 @@ index d9793941..bb14bf76 100644 if (!decls) return NULL; -@@ -3042,6 +3158,18 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) +@@ -3042,6 +3148,18 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) { var_t *var = decl->var; type_t *type = find_type_or_error(var->name, 0); @@ -6668,7 +6607,7 @@ index d9793941..bb14bf76 100644 *type_list = xmalloc(sizeof(type_list_t)); (*type_list)->type = type; (*type_list)->next = NULL; -@@ -3051,6 +3179,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) +@@ -3051,6 +3169,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) free(var); } @@ -6676,14 +6615,13 @@ index d9793941..bb14bf76 100644 return stmt; } -@@ -3091,7 +3220,7 @@ void init_loc_info(loc_info_t *i) +@@ -3091,7 +3210,7 @@ void init_loc_info(loc_info_t *i) static void check_def(const type_t *t) { - if (t->defined) -- error_loc("%s: redefinition error; original definition was at %s:%d\n", + if (type_is_defined(t)) -+ error_loc("BAR %s: redefinition error; original definition was at %s:%d\n", + error_loc("%s: redefinition error; original definition was at %s:%d\n", t->name, t->loc_info.input_name, t->loc_info.line_number); } diff --git a/mingw-w64-tools/widl/src/parser.yy.c b/mingw-w64-tools/widl/src/parser.yy.c @@ -9337,7 +9275,7 @@ index 9b1de2c8..2c2b1276 100644 return VT_PTR; } diff --git a/mingw-w64-tools/widl/src/typetree.c b/mingw-w64-tools/widl/src/typetree.c -index b93806be..f52b785f 100644 +index b93806be..488f7a49 100644 --- a/mingw-w64-tools/widl/src/typetree.c +++ b/mingw-w64-tools/widl/src/typetree.c @@ -30,12 +30,16 @@ @@ -9386,7 +9324,7 @@ index b93806be..f52b785f 100644 error_loc("argument '%s' has void type\n", arg->name); if (!arg->name) { -@@ -178,35 +181,29 @@ type_t *type_new_function(var_list_t *args) +@@ -178,34 +181,28 @@ type_t *type_new_function(var_list_t *args) return t; } @@ -9423,23 +9361,20 @@ index b93806be..f52b785f 100644 { type_t *type = get_type(TYPE_MODULE, name, NULL, 0); - if (type->type_type != TYPE_MODULE || type->defined) -- error_loc("%s: redefinition error; original definition was at %s:%d\n", + if (type->type_type != TYPE_MODULE || type_is_defined(type)) -+ error_loc("BAZ %s: redefinition error; original definition was at %s:%d\n", + error_loc("%s: redefinition error; original definition was at %s:%d\n", type->name, type->loc_info.input_name, type->loc_info.line_number); type->name = name; - return type; -@@ -215,15 +212,15 @@ type_t *type_new_module(char *name) +@@ -215,7 +212,7 @@ type_t *type_new_module(char *name) type_t *type_new_coclass(char *name) { type_t *type = get_type(TYPE_COCLASS, name, NULL, 0); - if (type->type_type != TYPE_COCLASS || type->defined) -- error_loc("%s: redefinition error; original definition was at %s:%d\n", + if (type->type_type != TYPE_COCLASS || type_is_defined(type)) -+ error_loc("BING %s: redefinition error; original definition was at %s:%d\n", + error_loc("%s: redefinition error; original definition was at %s:%d\n", type->name, type->loc_info.input_name, type->loc_info.line_number); type->name = name; - return type; +@@ -223,7 +220,7 @@ type_t *type_new_coclass(char *name) } @@ -10078,7 +10013,7 @@ index 118e2245..4f4252e3 100644 { MODE_Os, /* inline stubs */ diff --git a/mingw-w64-tools/widl/src/widltypes.h b/mingw-w64-tools/widl/src/widltypes.h -index 08584de5..b9c5a07d 100644 +index 08584de5..cd71e9af 100644 --- a/mingw-w64-tools/widl/src/widltypes.h +++ b/mingw-w64-tools/widl/src/widltypes.h @@ -40,6 +40,7 @@ typedef struct _attr_t attr_t; @@ -10279,20 +10214,7 @@ index 08584de5..b9c5a07d 100644 void init_types(void); type_t *alloc_type(void); -@@ -568,6 +607,12 @@ void clear_all_offsets(void); - #define tsSTRUCT 2 - #define tsUNION 3 - -+static inline const char* ts_to_str(int t) -+{ -+ static const char* strings[] = {"tsNULL", "tsENUM", "tsSTRUCT", "tsUNION"}; -+ return strings[t]; -+} -+ - var_t *find_const(const char *name, int f); - type_t *find_type(const char *name, struct namespace *namespace, int t); - type_t *make_type(enum type_type type); -@@ -582,38 +627,18 @@ void init_loc_info(loc_info_t *); +@@ -582,38 +621,18 @@ void init_loc_info(loc_info_t *); char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix);

1 0

[tor-browser-spec/master] Bug 31086: Add instructions for adding new locales to the download page
by gk＠torproject.org 08 Jul '19

08 Jul '19

commit aa2d2305af6449cd6f20ef46c7d504f94709b971 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jul 5 20:02:09 2019 +0200 Bug 31086: Add instructions for adding new locales to the download page --- processes/ReleaseProcess | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 9a8cb16..a358959 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -152,6 +152,18 @@ torsocks git push origin master:master cd .. +#. Add new locales to the download page + # If this release is introducing new locales, add them to the + # databags/download-alternatives.ini file (for a stable release) or + # the databags/download-alternatives-alpha.ini file (for an alpha + # release). + cd tpo + torsocks git pull origin + vim databags/download-alternatives.ini # or databags/download-alternatives-alpha.ini + git commit databags/download-alternatives.ini -m "Add new Tor Browser locales" + torsocks git push origin master:master + cd .. + #. Create blog post from changelog # See https://blog.torproject.org/blog/tor-browser-352-released for now # Don't forget to link to Mozilla's security advisories if this is a security

1 0

[tor-browser-build/master] Bug 30549: Avoid using keybox format in drop-expired-sub-keys
by gk＠torproject.org 08 Jul '19

08 Jul '19

commit cd6555af118fa06a30d54a491618b50c5d463c5d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jul 5 17:53:10 2019 +0200 Bug 30549: Avoid using keybox format in drop-expired-sub-keys When creating a new keyring with gpg >= 2.1, it will be created in the keybox format, which is only compatible with gpg >= 2.1. This means that the drop-expired-sub-keys script will create keyring files which are not compatible with older versions of gpg. To avoid this, we use the output of gpg --export as the keyring file, which is in the old format. --- tools/keyring/drop-expired-sub-keys | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/keyring/drop-expired-sub-keys b/tools/keyring/drop-expired-sub-keys index e7bbe50..f041746 100755 --- a/tools/keyring/drop-expired-sub-keys +++ b/tools/keyring/drop-expired-sub-keys @@ -16,7 +16,5 @@ set -e keyring="$1" test -f "$keyring" tmpfile=$(mktemp) -gpg --no-auto-check-trustdb --no-default-keyring --keyring "$keyring" --armor --export-options export-clean --export-filter 'drop-subkey=expired -t || revoked -t' --export > "$tmpfile" -rm -f "$keyring" -gpg --no-auto-check-trustdb --trust-model always --no-default-keyring --keyring "$keyring" --import "$tmpfile" -rm -f "$tmpfile" +gpg --no-auto-check-trustdb --no-default-keyring --keyring "$keyring" --export-options export-clean --export-filter 'drop-subkey=expired -t || revoked -t' --export > "$tmpfile" +mv -f "$tmpfile" "$keyring"

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_30549_v6'
by gk＠torproject.org 08 Jul '19

08 Jul '19

commit 1ece76a456213a16f23b41a6ce133a44a0302ee0 Merge: fdd4aaf cd6555a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 8 06:39:15 2019 +0000 Merge remote-tracking branch 'boklm/bug_30549_v6' tools/keyring/drop-expired-sub-keys | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)

1 0