aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Collapse)AuthorAge
* Merge branch 'remove_old_ver_checks'Nick Mathewson2012-09-10
|\
| * Remove one more check for an insanely old versionNick Mathewson2012-09-07
| |
| * Remove version_supports checks for versions before 0.2.2.Nick Mathewson2012-09-07
| |
* | Merge remote-tracking branch 'public/ticket6789'Nick Mathewson2012-09-10
|\ \
| * | Dirservers no longer accept tors released before December 2011.Nick Mathewson2012-09-07
| |/ | | | | | | Implements ticket 6789.
* | Fix tab introduced in f43946829ce037Nick Mathewson2012-09-10
| |
* | Merge remote-tracking branch 'linus/bug6797'Nick Mathewson2012-09-10
|\ \
| * | Don't follow the NULL pointer.Linus Nordberg2012-09-10
| | | | | | | | | | | | | | | | | | | | | | | | If dirvote_create_microdescriptor() returns NULL, don't use md. Found by "f. tp.". Fixes bug 6797.
* | | Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155Nick Mathewson2012-09-10
| | |
* | | Hide options beginning with "___" from GETINFO config/namesmeejah2012-09-10
| | |
* | | rename _UsingTestNetworkDefaults to start with triple-underscoremeejah2012-09-10
| | |
* | | raise bandwidthrate/bandwidthburst to a new "infinite"Roger Dingledine2012-09-10
|/ / | | | | | | addresses bug 6605.
* | finish backing out 5492de76Roger Dingledine2012-09-09
| |
* | minor logging improvementRoger Dingledine2012-09-09
|/
* Merge remote-tracking branch 'asn/bug6788'Nick Mathewson2012-09-07
|\
| * Remove redundant declaration of find_transport_name_by_bridge_addrport().George Kadianakis2012-09-07
| |
* | a debugging log line that just helped meRoger Dingledine2012-09-07
| |
* | Rename extend_info_alloc() --> _new()Nick Mathewson2012-09-06
| | | | | | | | | | Based on a patch from Linus, regenerated so as to not conflict with Linus's 5535/6363 patches.
* | Rename packed_cell_alloc() --> _new().Linus Nordberg2012-09-06
| |
* | Rename config_alloc() --> _new().Linus Nordberg2012-09-06
| |
* | Merge branch 'quiet_lib_versions_squashed'Nick Mathewson2012-09-06
|\ \
| * | Don't log about Libevent/OpenSSL initialization when all's wellNick Mathewson2012-09-06
| | | | | | | | | | | | | | | OTOH, log the Libevent and OpenSSL versions on the first line when we're starting Tor.
* | | Merge branch 'bug6778'Nick Mathewson2012-09-06
|\ \ \ | |_|/ |/| |
| * | Fix a dependency: micro-revision.i influences tor_main.o, not tor_main.cNick Mathewson2012-09-06
| | |
| * | Fix a build-warning when building out-of-treeNick Mathewson2012-09-06
| | | | | | | | | | | | | | | | | | | | | We were trying to incorporate all headers in common_sha1.i, not just the src/common ones. This is part of bug 6778; fix on 0.2.4.1-alpha
* | | Merge remote-tracking branch 'asn/bug4567_rebased'Nick Mathewson2012-09-06
|\ \ \
| * | | Figure out ORPort and DirPort even when 'auto' is used.George Kadianakis2012-09-05
| | | | | | | | | | | | | | | | | | | | Use router_get_advertised_{dir,or}_port() functions instead of get_primary_{dir,or}_port().
| * | | General tweaks and fixes for Nick's comments.George Kadianakis2012-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add changes/ files. * Edit the tor-fw-helper manpage. * Fix check-spaces. * Add prototype for get_list_of_ports_to_forward(). * Fix tor_parse_long() TCP port range. * Improve doc. of tor_check_port_forwarding(). * Check for overflows in tor_check_port_forwarding(). * Demote successful port forwarding to LOG_INFO. Conflicts: src/common/address.c src/or/circuitbuild.c
| * | | Tweak code and pump the tor-fw-helper version.George Kadianakis2012-09-05
| | | | | | | | | | | | | | | | | | | | Conflicts: src/or/circuitbuild.h
| * | | Start passing ports to tor_check_port_forwarding().George Kadianakis2012-09-05
| | | | | | | | | | | | | | | | | | | | Conflicts: src/or/transports.c
| * | | Refactor tor to support the new tor-fw-helper protocol.George Kadianakis2012-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add handle_fw_helper_output(), a function responsible for parsing the output of tor-fw-helper. Refactor tor_check_port_forwarding() and run_scheduled_events() accordingly too. We now issue warnings when we get control output from tor-fw-helper, and we log the verbose output of tor-fw-helper in LOG_INFO. Conflicts: src/common/util.c
| * | | Use get_lines_from_handle() in configure_proxy().George Kadianakis2012-09-05
| | | |
* | | | Merge remote-tracking branch 'asn/bug6765'Nick Mathewson2012-09-06
|\ \ \ \
| * | | | Use tor_malloc_zero() in var_cell_new().George Kadianakis2012-09-06
| |/ / / | | | | | | | | | | | | | | | | This is just a precaution; we seem to be using var_cell_t.payload and var_cell_t.payload_len correctly at the moment.
* | / / fix punctuation in logsRoger Dingledine2012-09-06
| |/ / |/| |
* | | Fix warning when implicitly casting strlen(microdesc) to intNick Mathewson2012-09-05
| | | | | | | | | | | | | | | Harmless unless we somehow generate a microdesc of more than INT_MAX bytes.
* | | make AuthDirHasIPv6Connectivity match the man pageRoger Dingledine2012-09-05
| | | | | | | | | | | | | | | | | | | | | | | | we can turn it into an autobool later if we have some way for it to make a decision. (patch possibly got lost when nickm merged #6770; or maybe nickm meant for it to be this way. i'm not sure.)
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-09-05
|\ \ \
| * | | Avoid segfault if EntryGuardPathBias precedes EntryGuardNick Mathewson2012-09-05
| | | | | | | | | | | | | | | | Fix for bug 6774; bugfix on 0.2.3.17-beta.
* | | | Whitespace fixes.Linus Nordberg2012-09-05
| | | |
* | | | Merge remote-tracking branch 'linus/bug6770_3'Nick Mathewson2012-09-05
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/tor.1.txt src/or/config.c
| * | | | Make AuthDirHasIPv6Connectivity a BOOL.Linus Nordberg2012-09-05
| | |/ / | |/| | | | | | | | | | This is a fix of unreleased tor. It solves ticket #6770.
* / | | Remove AuthDirPublishIPv6 and let AuthDirHasIPv6Connectivity fill its function.Linus Nordberg2012-09-05
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | See #4771 for rationale. Note that this patch does not take suggested changes in #4470 into account and keeps treating AuthDirHasIPv6Connectivity as an AUTOBOOL. Thus, bug fixes for that are included here as well. This is a fix on master, unreleased as of now.
* | | minor typos i found while constructing the changelogRoger Dingledine2012-09-05
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-09-04
|\| |
| * | Merge remote-tracking branch 'arma/bug6743' into maint-0.2.3Nick Mathewson2012-09-04
| |\ \
| | * | Make begindir_cutoff the same as general_cutoffRoger Dingledine2012-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow one-hop directory fetching circuits the full "circuit build timeout" period, rather than just half of it, before failing them and marking the relay down. This fix should help reduce cases where clients declare relays (or worse, bridges) unreachable because the TLS handshake takes a few seconds to complete. Fixes bug 6743 (one piece of bug 3443); bugfix on 0.2.2.2-alpha, where we changed the timeout from a static 30 seconds.
* | | | Merge branch 'bug5535_only_rebased'Nick Mathewson2012-09-04
|\ \ \ \
| * | | | Take microdesc into account when deciding about preferred OR port.Linus Nordberg2012-09-04
| | | | |
| * | | | Make node_ipv6_preferred() take microdescs into account.Linus Nordberg2012-09-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, make node_get_prim_orport() indicate in its return value whether a valid OR port was copied or not. Maybe we should make it legal to pass ap_out==NULL?