commit b4fae567313de6b99fe60843f98bac7f56bcfd88 Author: Tomás Touceda chiiph@torproject.org Date: Tue Aug 21 20:36:36 2012 -0300

Add changes file

Also fix file description --- changes/transportsServer | 3 +++ src/vidalia/config/TransportSettings.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/changes/transportsServer b/changes/transportsServer new file mode 100644 index 0000000..79404b3 --- /dev/null +++ b/changes/transportsServer @@ -0,0 +1,3 @@ + New features: + o Add the capabilities to configure a bridge with pluggable transports. + Resolves ticket 6412. diff --git a/src/vidalia/config/TransportSettings.cpp b/src/vidalia/config/TransportSettings.cpp index 748e77e..ce90f6f 100644 --- a/src/vidalia/config/TransportSettings.cpp +++ b/src/vidalia/config/TransportSettings.cpp @@ -10,7 +10,7 @@

/* ** \file TransportSettings.cpp -** \brief General Vidalia settings, such as language and interface style +** \brief Pluggable transport settings */

#include "TransportSettings.h"