commit 44e59e8d6e91bab002d93a978b8a4e36fbb5b9fb Merge: 33f867c c9266da Author: Georg Koppen gk@torproject.org Date: Mon Apr 20 08:41:44 2015 +0000

Merge remote-tracking branch 'mikeperry/bug15672'

RelativeLink/start-tor-browser | 55 ++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 14 deletions(-)