[tor-commits] [vidalia/alpha] Merge branch 'bug4724_httpproxy' into alpha

Mon Jan 23 16:45:42 UTC 2012

commit f3d84d5adcae926d046dbd4b29c441819b9d14f7
Merge: 7478260 d823576
Author: TomÃ¡s Touceda <chiiph at torproject.org>
Date:   Mon Jan 23 11:44:50 2012 -0300

    Merge branch 'bug4724_httpproxy' into alpha

 changes/bug4724                        |    3 +++
 src/vidalia/config/NetworkPage.cpp     |    1 -
 src/vidalia/config/NetworkSettings.cpp |   12 ------------
 src/vidalia/config/NetworkSettings.h   |    5 ++---
 4 files changed, 5 insertions(+), 16 deletions(-)