commit ddd79e67026e8bb64131462dae2ccb6d7d557c4e Merge: 27b9c7d 3a0ab36 Author: Mike Perry mikeperry-git@torproject.org Date: Wed Nov 27 19:35:16 2013 -0800

Merge remote-tracking branch 'brade/bug9570'

makexpi.sh | 4 +- src/chrome/content/torbutton.js | 89 +- src/components/certDialogsOverride.js | 170 --- src/components/ignore-history.js | 368 ------ src/components/nsSessionStore2.diff | 80 -- src/components/nsSessionStore2.js | 2233 -------------------------------- src/components/nsSessionStore3.diff | 111 -- src/components/nsSessionStore3.js | 2246 --------------------------------- 8 files changed, 73 insertions(+), 5228 deletions(-)