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

[arma at torproject.org]

commit a90affa84b3597667fd5dc8d9ff761a462653750
Merge: f473d83 88bb48e
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Nov 12 23:49:37 2012 -0500

    Merge branch 'maint-0.2.3'

 changes/bug7464 |    4 ++++
 src/or/main.c   |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)