[tor-commits] [user-manual/master] Merge remote-tracking branch 'arthur/20739+2'

[colin at torproject.org]

commit 680635eaf61b88bcc44dd016e054421af3b754bb
Merge: b3bb2ee 8b629dd
Author: Colin Childs <colin at torproject.org>
Date:   Wed Jan 18 00:41:06 2017 -0600

    Merge remote-tracking branch 'arthur/20739+2'

 fr/media/security-slider/slider_window.png | Bin 54528 -> 43609 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)