aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fold in changes for 0.2.3.12-alphaRoger Dingledine2012-02-11
|
* Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-02-10
|\
| * Downgrade "missing a certificate" from notice to infoNick Mathewson2012-02-10
| | | | | | | | | | | | | | It was apparently getting mistaken for a problem, even though it was at notice. Fixes 5067; fix on 0.2.0.10-alpha.
* | Add a changes file for bug 5066.Nick Mathewson2012-02-10
| | | | | | | | (It appeared in 0.2.3.11-alpha, but never in a released 0.2.2 afaict)
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-02-10
|\| | | | | | | | | | | | | Conflicts: src/common/tortls.c Conflict on comment near use of the new OPENSSL_V macro
| * Use correct CVE number for CVE-2011-4576. Found by fermenthor. bug 5066Nick Mathewson2012-02-10
| |
* | Merge branch 'maint-0.2.2'Roger Dingledine2012-02-09
|\|
| * Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2012-02-09
| |\
| | * Update to the February 2012 GeoIP database.Karsten Loesing2012-02-09
| | |
* | | revert the revert in master, since I didn't want to revert it thereRoger Dingledine2012-02-09
| | |
* | | Merge branch 'maint-0.2.2'Roger Dingledine2012-02-09
|\| |
| * | Revert "add a "docs" to the manual URI as listed in torrc.sample.in"Roger Dingledine2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-02-08
|\| |
| * | add a "docs" to the manual URI as listed in torrc.sample.inNick Mathewson2012-02-08
| | |
* | | Fix fencepost error with HearbeatPeriod optionSebastian Hahn2012-02-08
| | | | | | | | | | | | | | | We'd only log every HeartbeatPeriod + 1 seconds. Discovered by Scott Bennett, reported as bug 4942.
* | | Update sample torrc file for 0.2.3.xRoger Dingledine2012-02-08
| | | | | | | | | | | | | | | | | | | | | Fix broken URLs. Tell readers about the OutboundBindAddress, ExitPolicyRejectPrivate, and PublishServerDescriptor options.
* | | Merge branch 'maint-0.2.2'Roger Dingledine2012-02-02
|\| |
| * | Update "ClientOnly" man page entryRoger Dingledine2012-02-02
| | | | | | | | | | | | There isn't really any point to messing with it. Resolves ticket 5005.
* | | Merge branch 'bug4991_v2'Nick Mathewson2012-01-31
|\ \ \
| * | | Change WIN32 to _WIN32 in configure.in, too.Sebastian Hahn2012-01-31
| | | |
| * | | Fix straggling MS_WINDOWS issues; add a changes fileNick Mathewson2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Use the standard _WIN32, not the Torism MS_WINDOWS or deprecated WIN32Nick Mathewson2012-01-31
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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; }
* | | Merge remote-tracking branch 'arma/bug4013'Nick Mathewson2012-01-31
|\ \ \
| * | | if we ever have an old bridge, never again use microdescsRoger Dingledine2012-01-27
| | | | | | | | | | | | | | | | should reduce the risk of oscillation if our 0.2.2 bridge comes and goes
| * | | Allow 0.2.3.x clients to use 0.2.2.x bridges.Roger Dingledine2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Actually enable the windows absolute-path codeNick Mathewson2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | Checking for "WINDOWS" is wrong; our magic macro is MS_WINDOWS Fixes bug 4973; bugfix on 0.2.3.11-alpha.
* | | | Merge remote-tracking branch 'sebastian/osx_deadstrip'Nick Mathewson2012-01-27
|\ \ \ \ | |/ / / |/| | |
| * | | Use dead_strip to reduce binary size on OS XSebastian Hahn2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option seems to be supported all the way back to at least 10.4, so enabling it for OS X in general should be fine. If not, someone will yell. With no libs statically linked, that's a 3% win in binary size, with just libevent linked statically, this gives us an advantage of 5% in terms of binary size, and with libevent and openssl statically linked, we gain over 18% or over 500KB. Implements ticket 2915.
* | | | set SO_REUSEADDR before we bind, not afterRoger Dingledine2012-01-23
| | | | | | | | | | | | | | | | resolves bug 4950 (fixes a bug on commit aba7bb705a6 from #2850)
* | | | go nuts rewriting (changelog) historyRoger Dingledine2012-01-23
| | | |
* | | | bump to 0.2.3.11-alpha-devRoger Dingledine2012-01-23
| | | |
* | | | Use !SOCKET_OK to test if a socket is uninitializedSebastian Hahn2012-01-23
| | | | | | | | | | | | | | | | | | | | This fixes a compile warning on Windows. Fixes bug 4946, not in any released version.
* | | | update comment to reflect our TOR_INVALID_SOCKET conventionRoger Dingledine2012-01-22
| | | |
* | | | bump to 0.2.3.11-alphaRoger Dingledine2012-01-22
| | | |
* | | | give it a blurb and a release dateRoger Dingledine2012-01-22
| | | |
* | | | fold in recent changelog entriesRoger Dingledine2012-01-22
| | | |
* | | | Better documentation of transport-related torrc options.George Kadianakis2012-01-21
|/ / / | | | | | | | | | | | | Document ServerTransportPlugin and the managed proxy version of ClientTransportPlugin.
* | | Merge branch 'bug4893'Nick Mathewson2012-01-18
|\ \ \
| * | | Rename nonconformant identifiers.Nick Mathewson2012-01-18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 4893. These changes are pure mechanical, and were generated with this perl script: /usr/bin/perl -w -i.bak -p s/crypto_pk_env_t/crypto_pk_t/g; s/crypto_dh_env_t/crypto_dh_t/g; s/crypto_cipher_env_t/crypto_cipher_t/g; s/crypto_digest_env_t/crypto_digest_t/g; s/aes_free_cipher/aes_cipher_free/g; s/crypto_free_cipher_env/crypto_cipher_free/g; s/crypto_free_digest_env/crypto_digest_free/g; s/crypto_free_pk_env/crypto_pk_free/g; s/_crypto_dh_env_get_dh/_crypto_dh_get_dh/g; s/_crypto_new_pk_env_rsa/_crypto_new_pk_from_rsa/g; s/_crypto_pk_env_get_evp_pkey/_crypto_pk_get_evp_pkey/g; s/_crypto_pk_env_get_rsa/_crypto_pk_get_rsa/g; s/crypto_new_cipher_env/crypto_cipher_new/g; s/crypto_new_digest_env/crypto_digest_new/g; s/crypto_new_digest256_env/crypto_digest256_new/g; s/crypto_new_pk_env/crypto_pk_new/g; s/crypto_create_crypto_env/crypto_cipher_new/g; s/connection_create_listener/connection_listener_new/g; s/smartlist_create/smartlist_new/g; s/transport_create/transport_new/g;
* | | Merge remote-tracking branch 'public/bug4533_part1'Nick Mathewson2012-01-18
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/common/compat.h
| * | | Warn if sizeof(tor_socket_t) != sizeof(SOCKET)Nick Mathewson2012-01-17
| | | |
| * | | Use SOCKET_OK macros in even more placesNick Mathewson2012-01-17
| | | | | | | | | | | | | | | | | | | | | | | | Add a TOR_INVALID_SOCKET macro to wrap -1/INVALID_SOCKET. Partial work for bug4533.
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-01-18
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'public/bug4533_part2' into maint-0.2.2Nick Mathewson2012-01-18
| |\ \ \
| | * | | Fix SOCKET_OK test on win64.Nick Mathewson2012-01-18
| | | | | | | | | | | | | | | | | | | | Bugfix on 0.2.2.29-beta; partial fix for 4533; found by wanoskarnet
* | | | | Merge branch 'bug4012_023_squashed'Nick Mathewson2012-01-18
|\ \ \ \ \
| * | | | | Add missing documentation for some options introduced in 0.2.3.xNick Mathewson2012-01-18
|/ / / / /
* | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-01-18
|\| | | |
| * | | | Documentation for GiveGuardFlagTo... optionNick Mathewson2012-01-18
| |/ / /
* | / / Use tor_socket_t, not unsigned, in tor-fw-helper-natmp.cNick Mathewson2012-01-18
| |/ / |/| |