commit 8704443fa6f3c9ff7c971f8ea8b1e215f11fae35 Merge: 44e03fe d54502b Author: Georg Koppen gk@torproject.org Date: Fri Nov 28 09:37:50 2014 +0000

Merge branch 'isis/bug13504' into maint-4.0

Bundle-Data/PTConfigs/bridge_prefs.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)