commit 8e5dfe42a0230722bff07ba6ededcc0d2dbd53e7 Author: Nick Mathewson nickm@torproject.org Date: Sun Jun 19 20:58:46 2011 -0400

Tweak bug2355_revert at suggestion from Roger --- changes/bug2355_revert | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/changes/bug2355_revert b/changes/bug2355_revert index 0d2822a..2ded40a 100644 --- a/changes/bug2355_revert +++ b/changes/bug2355_revert @@ -1,6 +1,7 @@ o Minor bugfixes: - Revert the UseBridges option to its behavior before 0.2.2.28-beta. When we changed the default behavior to "use bridges if any are - listed in the torrc", we broke a number of Vidalia users. + listed in the torrc", we broke a number of users who had bridges + in their torrc files but who didn't actually want to use them. Partial resolution for bug 3354.