[tor-commits] [meek/master] Merge branch 'chrome'

commit e22a4bbd65feeab977e0611fb9d249cda39e66e2 Merge: f5d9da2 f3361a5 Author: David Fifield <david@bamsoftware.com> Date: Tue Apr 15 21:11:49 2014 -0700 Merge branch 'chrome' chrome/app/background.js | 149 ++++++++++++++++++++++++++++++++++++++++ chrome/app/manifest.json | 26 +++++++ chrome/extension/background.js | 126 +++++++++++++++++++++++++++++++++ chrome/extension/manifest.json | 20 ++++++ 4 files changed, 321 insertions(+)