summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-02-11 16:28:24 +0100
committeranonym <anonym@riseup.net>2016-02-11 16:28:24 +0100
commit34768779242d1bd79d6e35afa34c88d813a21816 (patch)
tree5f8c87e642d9bf70f102b7d34bcc6ddc3997af55
parent488dec2acd859009a76a029e1cb2a3382e7e63f3 (diff)
parent2fc6d139c647b12199a88de8ccf7b41915b7211e (diff)
parentd4a69eae2db4ac59cf020832dbc78f504e93b1aa (diff)
parentc4c08a088b86105e1f341fb3adc1bff540f8551a (diff)
Merge remote-tracking branches 'origin/bugfix/7943-simplify-tor-launcher-profile-path-workaround', 'origin/bugfix/11097-tor-browser-fontconfig' and 'origin/bugfix/9896-abstract-chroot-browser-configs' into stable