torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source 
Conflicts:
	src/or/config.c
	src/or/or.h
This commit is contained in:
Nick Mathewson
2011-06-19 21:00:15 -04:00
parent 42d6f34590 8e5dfe42a0
commit a046966baf
4 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug2355_revert
+7
View File
@@ -0,0 +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 users who had bridges
in their torrc files but who didn't actually want to use them.
Partial resolution for bug 3354.