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

[arma at torproject.org]

commit dc014c97472e3adf2306938841c13de0040a2ff0
Merge: a2f57b9 c88a4c5
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Sep 22 09:31:09 2012 -0400

    Merge branch 'maint-0.2.3'

 changes/ticket5749 |    3 +++
 src/or/config.c    |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)