[tor-commits] [tor/master] Merge branch 'maint-0.2.3'

[arma at torproject.org]

commit 6f82ae44cb85e61a729ccb7ce47451dae97e8602
Merge: f8c1ab7 97dbff5
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Sep 5 16:41:43 2012 -0400

    Merge branch 'maint-0.2.3'

 doc/tor.1.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)