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

[ioerror at torproject.org]

commit 9e05744e623c0956e06f066429ac05b9ccdf2763
Merge: 2abcf4d 218c5ca
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Tue Aug 23 12:41:10 2011 +0200

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

 packages/torouter-web/setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)