[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3

[nickm at torproject.org]

commit 692005b38d3607f53d9fb605a6b4584553417ad9
Merge: 6cf8e38 a1d060a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 23 12:35:23 2012 -0400

    Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3

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