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

Fri Oct 7 19:20:40 UTC 2011

commit 928e8ba257a101f7cd59dc828ab2d8a5bda157db
Merge: 4a084f1 2ec2ae2
Author: TomÃ¡s Touceda <chiiph at torproject.org>
Date:   Fri Sep 9 10:47:19 2011 -0300

    Merge branch 'feat2644_backport'

 changes/bug2644                       |    3 +
 src/vidalia/config/ServerPage.cpp     |   99 ++++++++++++++++++++-------------
 src/vidalia/config/ServerPage.ui      |   17 ++++--
 src/vidalia/config/ServerSettings.cpp |   18 ++++++-
 src/vidalia/config/ServerSettings.h   |    6 ++
 5 files changed, 99 insertions(+), 44 deletions(-)