summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-11-11Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: configure.in
2010-11-11Merge remote branch 'sebastian/remove-osx-expert-package' into maint-0.2.2Nick Mathewson
2010-11-11Merge branch 'maint-0.2.2'Roger Dingledine
Conflicts: src/or/config.c
2010-11-11Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2010-11-11let unpublished bridges learn their ip address tooRoger Dingledine
2010-11-10Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-11-10Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2010-11-10Enforce multiplicity rules when parsing annotations.Nick Mathewson
We would never actually enforce multiplicity rules when parsing annotations, since the counts array never got entries added to it for annotations in the token list that got added by earlier calls to tokenize_string. Found by piebeer.
2010-11-10Fix a bug where seting allow_annotations==0 only ignores annotations, but ↵Nick Mathewson
does not block them
2010-11-10Remove everything related to os x expert packageSebastian Hahn
We decided to no longer ship expert packages for OS X because they're a lot of trouble to keep maintained and confuse users. For those who want a tor on OS X without Vidalia, macports is a fine option. Alternatively, building from source is easy, too. The polipo stuff that is still required for the Vidalia bundle build can now be found in the torbrowser repository, git://git.torproject.org/torbrowser.git.
2010-11-09Merge branch 'maint-0.2.2'Roger Dingledine
2010-11-09fold the changes files into a changelogRoger Dingledine
2010-11-09Add a testing-only option to use bufferevent_openssl as a filterNick Mathewson
We need filtering bufferevent_openssl so that we can wrap around IOCP bufferevents on Windows. This patch adds a temporary option to turn on filtering mode, so that we can test it out on non-IOCP systems to make sure it hasn't got any surprising bugs. It also fixes some allocation/teardown errors in using bufferevent_openssl as a filter.
2010-11-08Merge branch 'loggranularity'Nick Mathewson
2010-11-08Make LogTimeGranularity respect validate_onlyNick Mathewson
2010-11-08Fix log granularity based on Nick's comments.Karsten Loesing
Instead of rejecting a value that doesn't divide into 1 second, round to the nearest divisor of 1 second and warn. Document that the option only controls the granularity written by Tor to a file or console log. It does not (for example) "batch up" log messages to affect times logged by a controller, times attached to syslog messages, or the mtime fields on log files.
2010-11-06Merge branch 'maint-0.2.2'Roger Dingledine
2010-11-06move to the november 1 maxmind geoip dbRoger Dingledine
2010-11-01Fix bug in tor_parse_string when Address is given as a dotted quad.Nick Mathewson
Found by Ian Goldberg and Mashael AlSabah. Bugfix on 0.2.3.0-alpha dev.
2010-10-29Fix up comments in choose_good_entry_server. Spotted by Robert Ransom.Nick Mathewson
2010-10-26Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-10-26Remove delay to become HSDir in privnetsSebastian Hahn
2010-10-26Properly refcount client_identity_keySebastian Hahn
In a2bb0bf we started using a separate client identity key. When we are in "public server mode" (that means not a bridge) we will use the same key. Reusing the key without doing the proper refcounting leads to a segfault on cleanup during shutdown. Fix that. Also introduce an assert that triggers if our refcount falls below 0. That should never happen.
2010-10-21Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/common/tortls.c
2010-10-21Fix a whitespace errorNick Mathewson
2010-10-21Merge branch 'bug988-nm' into maint-0.2.2Nick Mathewson
2010-10-21Add some asserts to get_{tlsclient|server}_identity_keyNick Mathewson
We now require that: - Only actual servers should ever call get_server_identity_key - If you're being a client or bridge, the client and server keys should differ. - If you're being a public relay, the client and server keys should be the same.
2010-10-21Rename get_client_identity_key to get_tlsclient_identity_keyNick Mathewson
2010-10-21Remove a ??? comment in node_get_by_nicknameNick Mathewson
Bug 1859 shows that the router_get_by_nickname behavior was wrong, and the node_get_by_nickname is right.
2010-10-21Add a node_get_by_hex_id().Nick Mathewson
2010-10-21Merge remote branch 'origin/maint-0.2.2' for bug 1859 patchesNick Mathewson
Some of this is already done in nodelist.
2010-10-21Fix a remaining bug in Robert's bug1859 fix.Nick Mathewson
When intro->extend_info is created for an introduction point, it only starts out with a nickname, not necessarily an identity digest. Thus, doing router_get_by_digest isn't necessarily safe.
2010-10-21Merge remote branch 'hoganrobert/bug1859' into maint-0.2.2Nick Mathewson
2010-10-21Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-10-21Merge remote branch 'sebastian/relay_early_rend' into maint-0.2.2Nick Mathewson
2010-10-20Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/networkstatus.c
2010-10-20Fix a logic error in 98aee84. Found by boboperNick Mathewson
2010-10-20Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/networkstatus.c
2010-10-20Add a ! to directory_caches_dir_info() to fix a logic errorNick Mathewson
We want to fetch directory info more aggressively if we need it to refuseunknownexits. Thus, we'll want it if our exit policy is _NOT_ reject *.
2010-10-20Merge branch 'bug2097' into maint-0.2.2Nick Mathewson
2010-10-20Fix a read of a freed pointer while in set_current_consensusNick Mathewson
Found by rransom while working on issue #988. Bugfix on 0.2.2.17-alpha. Fixes bug 2097.
2010-10-20Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-10-20Remove redundant -Wpointer-sign CFLAGSebastian Hahn
-Wpointer-sign is implied with -Wall, which we use when building with --enable-gcc-warnings.
2010-10-20Remove redundant -Wformat -Wformat-security CFLAGSSebastian Hahn
When configuring with --enable-gcc-warnings, we use -Wformat=2 which automatically enables the available -Wformat switches, so adding them again in the --enable-gcc-hardening case doesn't make sense..
2010-10-20Use ssp-buffer-size param when hardeningSebastian Hahn
We used to enable ssp-buffer-size=1 only when building with --enable-gcc-warnings. That would result in warnings (and no protection for small arrays) when building with --enable-gcc-hardening without enabling warnings, too. Fixes bug 2031. Also remove an XXX: We now allow to build with -fstack-protector by using --enable-gcc-hardening.
2010-10-18Send relay_early cells in rend circsSebastian Hahn
There are no relay left that run version 0.2.1.3 through 0.2.1.18, so changing this behaviour should be safe now.
2010-10-17Issues with router_get_by_nickname() (3)Robert Hogan
Add changes file
2010-10-17Issues with router_get_by_nickname()Robert Hogan
https://trac.torproject.org/projects/tor/ticket/1859 Use router_get_by_digest() instead of router_get_by_hexdigest() in circuit_discard_optional_exit_enclaves() and rend_client_get_random_intro(), per Nick's comments. Using router_get_by_digest() in rend_client_get_random_intro() will break hidden services published by Tor versions pre 0.1.2.18 and 0.2.07-alpha as they only publish by nickname. This is acceptable however as these versions only publish to authority tor26 and don't work for versions in the 0.2.2.x series anyway.
2010-10-15clarify fmt_addr32 documentation to note that the address is in host-orderNick Mathewson
2010-10-15Fix one-time memory leak when initializing libevent. Spotted by SebastianNick Mathewson