summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-02-13add a release blurb for 0.2.3.12-alphator-0.2.3.12-alphaRoger Dingledine
2012-02-13bump to 0.2.3.12-alphaRoger Dingledine
2012-02-13today is the day for a 0.2.3.12-alpha releaseRoger Dingledine
2012-02-13revise changelog entry for 5097 tooRoger Dingledine
2012-02-13Merge branch 'tmp'Roger Dingledine
2012-02-13Reinstate TOR_PR_EXTENDED_SERVER_PORT, just a littleNick Mathewson
2012-02-12Merge branch 'bug5082_squashed'Nick Mathewson
2012-02-12set_managed_proxy_environment() can't fail anymoreSebastian Hahn
It already couldn't fail on Windows, now it can't fail on non-Windows, either.
2012-02-12Properly set up environment for managed-mode obfsproxySebastian Hahn
2012-02-12integrate recent changes filesRoger Dingledine
2012-02-12Merge branch 'bug5084_squashed'Nick Mathewson
2012-02-12Add a changes file for bug5084Nick Mathewson
2012-02-12Try to have (and maintain!) an invariant about unconfigured_proxies_nNick Mathewson
The invariant is: unconfigured_proxies_n is exactly the number of managed_proxy_t not in state PT_PROTO_COMPLETED. To maintain this, we need to stop overloading unconfigured_proxies_n to also count managed_proxy_t items that are in PT_PROTO_COMPLETED but which might need relaunching. To make it so we can detect those, we introduce another variable. This commit also adds a function to assert that we haven't broken the invariant. Fix for bug 5084; bugfix on 0.2.3.6-alpha, I think.
2012-02-12Don't smartlist_remove a managed proxy from a list we're iterating over.Nick Mathewson
In some cases, we solve this by doing a SMARTLIST_DEL_CURRENT before calling managed_proxy_destroy. But for a trickier one, we just make a copy of the list before iterating over it, so that changes to the manage proxy list don't hurt our iteration. This could be related to bug 5084.
2012-02-12Fix a check-spaces complaintSebastian Hahn
2012-02-12Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/common/Makefile.am src/or/Makefile.am
2012-02-12Unpack a smartlist_foreach and add an assert: try to hunt #5102Nick Mathewson
2012-02-12Fix #5097 on Windows, tooRobert Ransom
2012-02-12Fix bug #5097: remove bogus envvar from managed proxies' environmentRobert Ransom
2012-02-11fold in changes for 0.2.3.12-alphaRoger Dingledine
2012-02-10Properly protect paths to sed, sha1sum, opensslSebastian Hahn
in Makefile.am, we used it without quoting it, causing build failure if your openssl/sed/sha1sum happened to live in a directory with a space in it (very common on windows)
2012-02-10Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-02-10Downgrade "missing a certificate" from notice to infoNick Mathewson
It was apparently getting mistaken for a problem, even though it was at notice. Fixes 5067; fix on 0.2.0.10-alpha.
2012-02-10Add a changes file for bug 5066.Nick Mathewson
(It appeared in 0.2.3.11-alpha, but never in a released 0.2.2 afaict)
2012-02-10Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/common/tortls.c Conflict on comment near use of the new OPENSSL_V macro
2012-02-10Use correct CVE number for CVE-2011-4576. Found by fermenthor. bug 5066Nick Mathewson
2012-02-09Merge branch 'maint-0.2.2'Roger Dingledine
2012-02-09Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2012-02-09revert the revert in master, since I didn't want to revert it thereRoger Dingledine
2012-02-09Merge branch 'maint-0.2.2'Roger Dingledine
2012-02-09Revert "add a "docs" to the manual URI as listed in torrc.sample.in"Roger Dingledine
This reverts commit 55e8cae81553678ec77ce6b8fb1bf2d5e483e0aa. The conversation from irc: > weasel: i had intended to leave torrc.sample.in alone in maint-0.2.2, since i don't want to make all your stable users have to deal with a torrc change. but nickm changed it. is it in fact the case that a change in that file means a change in the deb? <weasel> it means you'll prompt every single user who ever touched their torrc <weasel> and they will be asked if they like your new version better than what they have right now <weasel> so it's not great Instead I changed the website to redirect requests for the tor-manual URL listed in maint-0.2.2's torrc.sample.in so the link will still work.
2012-02-09Update to the February 2012 GeoIP database.maint-0.2.1Karsten Loesing
2012-02-08Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-02-08add a "docs" to the manual URI as listed in torrc.sample.inNick Mathewson
2012-02-08Fix fencepost error with HearbeatPeriod optionSebastian Hahn
We'd only log every HeartbeatPeriod + 1 seconds. Discovered by Scott Bennett, reported as bug 4942.
2012-02-08Update sample torrc file for 0.2.3.xRoger Dingledine
Fix broken URLs. Tell readers about the OutboundBindAddress, ExitPolicyRejectPrivate, and PublishServerDescriptor options.
2012-02-02Merge branch 'maint-0.2.2'Roger Dingledine
2012-02-02Update "ClientOnly" man page entryRoger Dingledine
There isn't really any point to messing with it. Resolves ticket 5005.
2012-01-31Merge branch 'bug4991_v2'Nick Mathewson
2012-01-31Change WIN32 to _WIN32 in configure.in, too.Sebastian Hahn
2012-01-31Fix straggling MS_WINDOWS issues; add a changes fileNick Mathewson
There was one MS_WINDOWS that remained because it wasn't on a macro line; a few remaining uses (and the definition!) in configure.in; and a now-nonsensical stanza of eventdns_tor.h that previously defined 'WIN32' if it didn't exist.
2012-01-31Use the standard _WIN32, not the Torism MS_WINDOWS or deprecated WIN32Nick Mathewson
This commit is completely mechanical; I used this perl script to make it: #!/usr/bin/perl -w -i.bak -p if (/^\s*\#/) { s/MS_WINDOWS/_WIN32/g; s/\bWIN32\b/_WIN32/g; }
2012-01-31Merge remote-tracking branch 'arma/bug4013'Nick Mathewson
2012-01-31Actually enable the windows absolute-path codeNick Mathewson
Checking for "WINDOWS" is wrong; our magic macro is MS_WINDOWS Fixes bug 4973; bugfix on 0.2.3.11-alpha.
2012-01-27if we ever have an old bridge, never again use microdescsRoger Dingledine
should reduce the risk of oscillation if our 0.2.2 bridge comes and goes
2012-01-27Merge remote-tracking branch 'sebastian/osx_deadstrip'Nick Mathewson
2012-01-25Allow 0.2.3.x clients to use 0.2.2.x bridges.Roger Dingledine
Previously the client would ask the bridge for microdescriptors, which are only supported in 0.2.3.x and later, and then fail to bootstrap when it didn't get the answers it wanted. Fixes bug 4013; bugfix on 0.2.3.2-alpha. The fix here is to revert to using normal descriptors if any of our bridges are known to not support microdescs. This is not ideal, a) because we'll start downloading a microdesc consensus as soon as we get a bridge descriptor, and that will waste time if we later get a bridge descriptor that tells us we don't like microdescriptors; and b) by changing our mind we're leaking to our other bridges that we have an old-version bridge. The alternate fix would have been to change we_use_microdescriptors_for_circuits() to ask if *any* of our bridges can support microdescriptors, and then change the directory logic that picks a bridge to only select from those that do. For people living in the future, where 0.2.2.x is obsolete, there won't be a difference. Note that in either of these potential fixes, we have risk of oscillation if our one funny-looking bridges goes away / comes back.
2012-01-23set SO_REUSEADDR before we bind, not afterRoger Dingledine
resolves bug 4950 (fixes a bug on commit aba7bb705a6 from #2850)
2012-01-23go nuts rewriting (changelog) historyRoger Dingledine
2012-01-23bump to 0.2.3.11-alpha-devRoger Dingledine
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion