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

[arma at torproject.org]

commit 9ab3b332aec076451dd93d11ce7ce1fd81ff7294
Merge: abbde7b 909691f
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Sep 14 02:41:13 2012 -0400

    Merge branch 'maint-0.2.3'

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