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

[hellais at torproject.org]

commit 5f78ef9d5e4716ca40b72aa747c7a5f027177c49
Merge: 1a75c1e 254d2d3
Author: Arturo Filastò <hellais at torproject.org>
Date:   Fri Aug 19 15:29:41 2011 +0200

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

 packages/torouter-prep/configs/sources.list |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)