[tor-commits] [torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter

[hellais at torproject.org]

commit 9b11ad9654554273bb77df4152e6de6912c19a6f
Merge: 1e8a3c1 ecd17f3
Author: Arturo Filastò <hellais at torproject.org>
Date:   Tue Aug 23 12:24:22 2011 +0200

    Merge branch 'master' of ssh://git-rw.torproject.org/torouter

 packages/torouter-prep/configs/torrc          |    4 ++--
 packages/torouter-prep/src/torouter_config.sh |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)