Fix bug in duplicate ruleset checking
Remove extra output for debugging
Replace '/'.join with os.path.join
Merge branch '3.0' of git://gitweb.torproject.org/https-everywhere into 3.0
[About Ads] Fix

https://trac.torproject.org/projects/tor/ticket/8785
[Google Services] Add culturalinstitute

Fixes https://trac.torproject.org/projects/tor/ticket/7696

Conflicts:
	src/chrome/content/rules/GoogleServices.xml
[Amazon Web Services] Exclude Epicmafia css

https://trac.torproject.org/projects/tor/ticket/7857

Conflicts:
	src/chrome/content/rules/AmazonAWS.xml
[TorrentFreak] Don't force www

Might fix https://trac.torproject.org/projects/tor/ticket/9032
[AnchorFree] breaks www.hsselite.com/sign-in login
Merge remote-tracking branch 'origin/3.0' into 3.0
[BBC] Fix archived radio streams

https://trac.torproject.org/projects/tor/ticket/9136

Conflicts:
	src/chrome/content/rules/BBC.xml
[Cloudfront] Add exclusion

Fixes https://trac.torproject.org/projects/tor/ticket/9146

Conflicts:
	src/chrome/content/rules/Cloudfront.xml
[Microsoft.com] Exclude health pages

Fixes https://trac.torproject.org/projects/tor/ticket/9148

Conflicts:
	src/chrome/content/rules/Microsoft.xml
Reddit (via pay.reddit.com)

Requested by TorPal.
[HypeMachine] Add exclusions

https://trac.torproject.org/projects/tor/ticket/9153
[Formstack] Fix
updated readme to add Linux and OSX build instructions, and changing the format to markdown

https://trac.torproject.org/projects/tor/ticket/9139
Merge branch '3.0' of https://git.torproject.org/https-everywhere into 3.0
Fix for nsITreeView changes in Firefox 22

https://trac.torproject.org/projects/tor/ticket/8997
Changelog for 3.2.3