commit ab5010d412d0ca0758122d3529ad3095954cdff4 Merge: dbe9a0d 0116a2a Author: Mike Perry mikeperry-git@torproject.org Date: Wed Mar 25 10:24:37 2015 -0700

Merge remote-tracking branch 'arthur/ftp-isolation' into 1.9-next

src/components/domain-isolator.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)