commit 1d53083cda57bac8c1d8b8feb805dc7cac9d557d Merge: fc91b51 08728b3 Author: Mike Perry mikeperry-git@torproject.org Date: Tue Sep 15 21:05:06 2015 -0700

Merge remote-tracking branch 'brade/bug16735-01'

src/chrome/content/aboutTor/aboutTor.xhtml | 205 ++++++++++++-------- .../content/aboutTor/onionArrow-extension.png | Bin 1695 -> 1798 bytes .../content/aboutTor/onionArrow-leftBend.png | Bin 0 -> 2080 bytes src/chrome/content/aboutTor/onionArrow-right.png | Bin 2503 -> 0 bytes .../content/aboutTor/onionArrow-rightBend.png | Bin 0 -> 2077 bytes src/chrome/content/aboutTor/onionArrow.png | Bin 2381 -> 0 bytes src/chrome/skin/aboutTor.css | 68 +++---- 7 files changed, 157 insertions(+), 116 deletions(-)