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

[hellais at torproject.org]

commit b3f4d69254943b65a482c85a4d85b351af1e2712
Merge: 9ac2c7a 6657b82
Author: Arturo Filastò <hellais at torproject.org>
Date:   Fri Aug 26 00:54:10 2011 +0200

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

 freedom-maker/README                          |   20 +++++++++++++++++---
 packages/torouter-prep/src/torouter_config.sh |    3 +++
 2 files changed, 20 insertions(+), 3 deletions(-)