summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | Disable logging to control port connections in buf_shrink_freelists.Robert Ransom2010-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If buf_shrink_freelists calls log_warn for some reason, we don't want the log call itself to throw buf_shrink_freelists further off the rails.
| | * | | | | | | Move the original log_info call out of the core of buf_shrink_freelists.Robert Ransom2010-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending a log message to a control port can cause Tor to allocate a buffer, thereby changing the length of the freelist behind buf_shrink_freelists's back, thereby causing an assertion to fail. Fixes bug #1125.
| * | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2010-11-12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Add changes file for bug1125Nick Mathewson2010-11-12
| | | | | | | |
| | * | | | | | Disable logging to control port connections in buf_shrink_freelists.Robert Ransom2010-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If buf_shrink_freelists calls log_warn for some reason, we don't want the log call itself to throw buf_shrink_freelists further off the rails.
| | * | | | | | Move the original log_info call out of the core of buf_shrink_freelists.Robert Ransom2010-11-12
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending a log message to a control port can cause Tor to allocate a buffer, thereby changing the length of the freelist behind buf_shrink_freelists's back, thereby causing an assertion to fail. Fixes bug #1125.
* | | | | | | Stop linking src/tools/* against libeventNick Mathewson2010-11-11
| | | | | | |
* | | | | | | Merge remote branch 'public/refactor_pports'Nick Mathewson2010-11-11
|\ \ \ \ \ \ \
| * | | | | | | Make the predicted ports logic a little simpler.Nick Mathewson2010-10-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly, this comes from turning two lists that needed to be kept in synch into a single list of structs. This should save a little RAM, and make the code simpler.
* | | | | | | | Fix up tor-fw-helper "INCLUDES" directiveNick Mathewson2010-11-11
| | | | | | | |
* | | | | | | | Split long lines in configure.in and Makefile.am filesNick Mathewson2010-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having very long single lines with lots and lots of things in them tends to make files hard to diff and hard to merge. Since our tools are one-line-at-a-time, we should try to construct lists that way too, within reason. This incidentally turned up a few headers in configure.in that we were for some reason searching for twice.
* | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-11-11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.in
| * | | | | | | Merge remote branch 'sebastian/remove-osx-expert-package' into maint-0.2.2Nick Mathewson2010-11-11
| |\ \ \ \ \ \ \
| | * | | | | | | Remove everything related to os x expert packageSebastian Hahn2010-11-10
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2010-11-11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/config.c
| * | | | | | | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2010-11-11
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | let unpublished bridges learn their ip address tooRoger Dingledine2010-11-11
| | | | | | | |
* | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-11-10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2010-11-10
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | |
| | * | | | | Enforce multiplicity rules when parsing annotations.Nick Mathewson2010-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Fix a bug where seting allow_annotations==0 only ignores annotations, but ↵Nick Mathewson2010-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | does not block them
* | | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2010-11-09
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | fold the changes files into a changelogRoger Dingledine2010-11-09
| | | | | | |
* | | | | | | Add a testing-only option to use bufferevent_openssl as a filterNick Mathewson2010-11-09
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'loggranularity'Nick Mathewson2010-11-08
|\ \ \ \ \ \
| * | | | | | Make LogTimeGranularity respect validate_onlyNick Mathewson2010-11-08
| | | | | | |
| * | | | | | Fix log granularity based on Nick's comments.Karsten Loesing2010-11-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Make logging resolution configurable.Karsten Loesing2010-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements enhancement 1668.
* | | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2010-11-06
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | move to the november 1 maxmind geoip dbRoger Dingledine2010-11-06
| | | | | | |
| * | | | | | Remove delay to become HSDir in privnetsSebastian Hahn2010-10-26
| | |_|_|/ / | |/| | | |
* | | | | | Fix bug in tor_parse_string when Address is given as a dotted quad.Nick Mathewson2010-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found by Ian Goldberg and Mashael AlSabah. Bugfix on 0.2.3.0-alpha dev.
* | | | | | Fix up comments in choose_good_entry_server. Spotted by Robert Ransom.Nick Mathewson2010-10-29
| | | | | |
* | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-10-26
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Properly refcount client_identity_keySebastian Hahn2010-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-10-21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: src/common/tortls.c
| * | | | | Fix a whitespace errorNick Mathewson2010-10-21
| | | | | |
| * | | | | Merge branch 'bug988-nm' into maint-0.2.2Nick Mathewson2010-10-21
| |\ \ \ \ \
| | * | | | | Add some asserts to get_{tlsclient|server}_identity_keyNick Mathewson2010-10-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Rename get_client_identity_key to get_tlsclient_identity_keyNick Mathewson2010-10-21
| | | | | | |
| | * | | | | Maintain separate server and client identity keys when appropriate.Robert Ransom2010-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug described in ticket #988.
| | * | | | | Maintain separate server and client TLS contexts.Robert Ransom2010-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #988.
| | * | | | | Refactor tor_tls_context_new:Robert Ransom2010-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make tor_tls_context_new internal to tortls.c, and return the new tor_tls_context_t from it. * Add a public tor_tls_context_init wrapper function to replace it.
| | * | | | | Add public_server_mode function.Robert Ransom2010-10-04
| | | | | | |
* | | | | | | Remove a ??? comment in node_get_by_nicknameNick Mathewson2010-10-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 1859 shows that the router_get_by_nickname behavior was wrong, and the node_get_by_nickname is right.
* | | | | | | Add a node_get_by_hex_id().Nick Mathewson2010-10-21
| | | | | | |
* | | | | | | Merge remote branch 'origin/maint-0.2.2' for bug 1859 patchesNick Mathewson2010-10-21
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Some of this is already done in nodelist.
| * | | | | | Fix a remaining bug in Robert's bug1859 fix.Nick Mathewson2010-10-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Merge remote branch 'hoganrobert/bug1859' into maint-0.2.2Nick Mathewson2010-10-21
| |\ \ \ \ \ \
| | * | | | | | Issues with router_get_by_nickname() (3)Robert Hogan2010-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changes file