commit cc1981d0e85f2e640ba6a9f6f9e57bbca323dccf Merge: 8c34207 9e05744 Author: Arturo Filastò <hellais@torproject.org> Date: Tue Aug 23 12:48:30 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/src/torouter_config.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)