commit b3775aa1b6ad8c5f4a8328ec9cd746763fc06428 Merge: c1e7f60 cf25843 Author: Tomás Touceda chiiph@torproject.org Date: Mon Jan 23 13:17:05 2012 -0300

Merge branch 'bug4724_httpproxy_backport'

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(-)