Bug #9587: about:tor lacks the TBB 3.X version number.
Bug #9224: about:tor fails if > 1 SOCKS listener

Correctly parse GETINFO response when more than one
SOCKS listener is configured.
Merge branch 'bug9587'
Merge remote-tracking branch 'brade/bug9224'
Add changelog entries and bump version number for 1.6.3.
Bug #9454:  The nsIPluginTag Interface was changed.

Modify torbutton_toggle_plugins() to use the new enabledState
attribute if it is available (FF23 and newer).
Remove some old components that are not used.
Bug #9570: Private browsing changes since FF ESR 17.

Use new APIs while maintaining compatibility with older versions of Firefox.
Bug #9570: Private browsing changes since FF ESR 17.

Clear the private browsing image cache as well as the regular one.
Bug 9114: Workaround for missing translation properties.

Displaying the property name is better than throwing uncaught exceptions...
Import new translations.
Bump version for 1.6.4.
Bug #10002: Make the update URL point directly at the TBB3.0 blog tag.

As good a place as any for now, I guess...
Update translations and add Japanese to locale list.
Add changelog entry and bump version.
Merge remote-tracking branch 'brade/bug9454'
Add some comments to the Bug #9454 check.
Merge remote-tracking branch 'brade/bug9570'
Bug #10078: Updated code to clear SSL identifier cache in ESR24

Also clean up comments and whitespace.
Bug 10078: clearing crypto auth tokens; removing own handling of SSL session identifier cache as we get that for free when calling logoutAndTeardown()