commit 9d2b5c639160349d6aa02cc28c7df58fcf1bcd16 Merge: 8ff89c0 f550eda Author: Erinn Clark <erinn@torproject.org> Date: Wed Oct 24 16:33:09 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/prefs.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)