[tor-commits] [flashproxy/master] Merge branch 'nodejs-cli'

commit 611931cdcde313d794c7e16ed251c11a93a6e9e3 Merge: 3406eb1 7211f2f Author: Ximin Luo <infinity0@gmx.com> Date: Fri Nov 22 13:19:08 2013 +0000 Merge branch 'nodejs-cli' proxy/modules/nodejs/INSTALL | 2 +- proxy/modules/nodejs/main.js | 41 +++++++++++++++++++++++++++++++------ proxy/modules/nodejs/package.json | 7 ++++--- 3 files changed, 40 insertions(+), 10 deletions(-)