[tor-commits] [vidalia/master] Merge branch 'bug3109_torrc'

[chiiph at torproject.org]

commit 8528f79bbabb07c8c711ba1144361843fc0daee9
Merge: a47326a bea1e28
Author: Tomas Touceda <chiiph at torproject.org>
Date:   Sat Jun 11 03:21:41 2011 -0300

    Merge branch 'bug3109_torrc'

 src/vidalia/config/AdvancedPage.cpp |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)