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

[nickm at torproject.org]

commit 20b625a0fdcf334f448bc5a49fee0d78137ed231
Merge: 952f562 692005b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 23 12:36:04 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'

 changes/bug6274   |    3 +++
 changes/bug6274_2 |    3 +++
 src/or/config.c   |    9 ++++++++-
 3 files changed, 14 insertions(+), 1 deletions(-)