Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 3e3a860c88dd
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: aa34268dc87a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 11, 2018

  1. tor-browser-bundle: update license to free

    The Tor Browser Bundle is free software under various licenses:
    
    > Can I distribute Tor?
    > 
    > Yes.
    > 
    > The Tor software is free software. This means we give you the rights
    > to redistribute the Tor software, either modified or unmodified,
    > either for a fee or gratis. You don't have to ask us for specific
    > permission.
    > 
    > However, if you want to redistribute the Tor software you must follow
    > our LICENSE. Essentially this means that you need to include our
    > LICENSE file along with whatever part of the Tor software you're
    > distributing.
    > 
    > Most people who ask us this question don't want to distribute just the
    > Tor software, though. They want to distribute the Tor Browser. This
    > includes Firefox Extended Support Release, and the NoScript and
    > HTTPS-Everywhere extensions. You will need to follow the license for
    > those programs as well. Both of those Firefox extensions are
    > distributed under the GNU General Public License, while Firefox ESR is
    > released under the Mozilla Public License. The simplest way to obey
    > their licenses is to include the source code for these programs
    > everywhere you include the bundles themselves. 
    
    (https://www.torproject.org/docs/faq.html.en#DistributingTor)
    
    tor-browser-bundle-bin is already marked as licenses.free, so it doesn't
    really make sense that this one is marked as unfree.
    alyssais committed Jul 11, 2018
    Copy the full SHA
    a269e5a View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. Merge pull request #43391 from alyssais/patch-3

    tor-browser-bundle: update license to free
    joachifm committed Jul 12, 2018
    Copy the full SHA
    aa34268 View commit details
    Browse the repository at this point in the history