aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
Commit message (Expand)AuthorAge
* Merge branch 'maint-0.2.2'•••Conflicts: src/or/dirserv.c Roger Dingledine2011-11-21
|\
| * parameterize bw cutoffs to guarantee Fast and Guard flags•••Now it will be easier for researchers to simulate Tor networks with different values. Resolves ticket 4484. Roger Dingledine2011-11-21
* | normalize the name of the CERTS cellRoger Dingledine2011-10-31
* | Merge branch 'maint-0.2.2_secfix' into master_secfix•••Conflicts: src/common/tortls.c src/or/connection_or.c src/or/dirserv.c src/or/or.h Sebastian Hahn2011-10-27
|\|
| * Add option to give guard flag to relays without the CVE-2011-2768 fix•••This way, all of the DA operators can upgrade immediately, without nuking every client's set of entry guards as soon as a majority of them upgrade. Until enough guards have upgraded, a majority of dirauths should set this config option so that there are still enough guards in the network. After a few days pass, all dirauths should use the default. Robert Ransom2011-10-26
| * Merge branch 'maint-0.2.1_secfix' into maint-0.2.2_secfix•••Conflicts: src/or/connection_or.c Sebastian Hahn2011-10-26
| |\
| | * Mark which OR connections are outgoingRobert Ransom2011-10-26
| | * Don't use any OR connection which sent us a CREATE_FAST cell for an EXTEND•••Fix suggested by Nick Mathewson. Robert Ransom2011-10-26
| | * Rename get_client_identity_key to get_tlsclient_identity_keyNick Mathewson2011-10-26
| | * Maintain separate server and client identity keys when appropriate.•••Fixes a bug described in ticket #988. Conflicts: src/or/main.c src/or/router.c Robert Ransom2011-10-26
| | * Add public_server_mode function.Robert Ransom2011-10-26
* | | remove code related to tracking descriptor serving times•••This had broken due to bitrot - it doesn't know about microdescriptors at all, and afaik hasn't generally been used in ages. Sebastian Hahn2011-10-21
* | | Quiet two notices, and spelling mistake cleanupSebastian Hahn2011-10-10
* | | Remove auth_challenge field from or_handshake_state_t•••We didn't need to record this value; it was already recorded implicitly while computing cell digests for later examination in the authenticate cells. Nick Mathewson2011-10-10
* | | Make sure we stop putting cells into our hash at the right time.Nick Mathewson2011-10-10
* | | Hook up all of the prop176 code; allow v3 negotiations to actually workNick Mathewson2011-10-10
* | | Implement cert/auth cell readingNick Mathewson2011-10-10
* | | Functions to send cert and auth_challenge cells.Nick Mathewson2011-10-10
* | | Cell types and states for new OR handshake•••Also, define all commands > 128 as variable-length when using v3 or later link protocol. Running into a var cell with an unrecognized type is no longer a bug. Nick Mathewson2011-10-10
* | | Merge remote-tracking branch 'asn2/bug3656'•••Conflicts: src/common/util.c src/common/util.h src/or/config.h src/or/main.c src/test/test_util.c Nick Mathewson2011-10-07
|\ \ \
| * | | Server transport proxies should bind on the same port each time, if possible.George Kadianakis2011-08-07
| * | | Add support for managed {Client,Server}TransportPlugin parsing.George Kadianakis2011-07-13
* | | | Merge remote-tracking branch 'rransom-tor/bug3335-v2'•••Conflicts: src/or/connection_edge.c src/or/rendclient.c Nick Mathewson2011-10-03
|\ \ \ \
| * | | | Detect and remove unreachable intro pointsRobert Ransom2011-10-02
| * | | | Record intro point timeouts in rend_intro_point_tRobert Ransom2011-10-02
| | |/ / | |/| |
* | | | Fix a crash bug in tor_assert(md->held_by_node)•••The fix is to turn held_by_node into a reference count. Fixes bug 4118; bugfix on 0.2.3.1-alpha. Nick Mathewson2011-09-28
* | | | Fix issues in 3630 patch noted by KarstenNick Mathewson2011-09-22
* | | | New torrc option to allow bucket refill intervals of less than 1 sec•••Implements bug3630. Florian Tschorsch2011-09-22
* | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-09-13
|\| | |
| * | | Merge branch 'maint-0.2.1' into maint-0.2.2•••Conflicts: src/or/main.c src/or/router.c Roger Dingledine2011-09-13
| |\ \ \ | | | |/ | | |/|
| | * | Generate our ssl session certs with a plausible lifetime•••Nobody but Tor uses certs on the wire with 2 hour lifetimes, and it makes us stand out. Resolves ticket 4014. Roger Dingledine2011-09-13
| | * | Check fetched rendezvous descriptors' service IDsRobert Ransom2011-05-16
| | * | Forget all rendezvous client state on SIGNAL NEWNYMRobert Ransom2011-04-28
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-09-11
|\| | |
| * | | Describe rend_service_descriptor_t more completelyRobert Ransom2011-09-10
| * | | Describe rend_intro_point_t more completelyRobert Ransom2011-09-10
* | | | Fix whitespace issues in patches merged today so farNick Mathewson2011-09-07
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts: src/or/dirserv.c src/or/networkstatus.c Conflicts were related to routerinfo->node shift. Nick Mathewson2011-09-07
|\| | |
| * | | Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2Nick Mathewson2011-09-07
| |\ \ \
| | * | | Add a VoteOnHidServDirectoriesV2 configuration optionRobert Ransom2011-06-03
* | | | | Merge remote-tracking branch 'public/split_entry_conn'•••Conflicts: src/or/connection.c src/or/connection_edge.c src/or/connection_edge.h src/or/dnsserv.c Some of these were a little tricky, since they touched code that changed because of the prop171 fixes. Nick Mathewson2011-09-07
|\ \ \ \ \
| * | | | | Move entry-only fields from edge_connection_t to entry_connection_t•••Also, refactor the code accordingly. Nick Mathewson2011-07-21
| * | | | | Add a new type entry_connection_t for entry connections•••No fields have moved there yet; for now, it's just a placeholder type. Nick Mathewson2011-07-21
* | | | | | Fix handling of ISO_STREAM•••Now we track *which* stream with ISO_STREAM set is associated to a particular circuit, so that we won't think that stream is incompatible with its circuit and launch another one a second later, and we use that same field to mark circuits which have had an ISO_STREAM stream attached to them, so that we won't ever put a second stream on that circuit. Fixes bug 3695. Robert Ransom2011-08-08
* | | | | | Handle storing much longer socks4 authentication data.Nick Mathewson2011-08-05
* | | | | | Treat socks_request->{username,password} as non-NUL-terminated•••They *are* non-NUL-terminated, after all (and they have to be, since the SOCKS5 spec allows them to contain embedded NULs. But the code to implement proposal 171 was copying them with tor_strdup and comparing them with strcmp_opt. Fix for bug on 3683; bug not present in any yet-released version. Nick Mathewson2011-08-04
* | | | | | Implement protocol-type isolation correctly.•••Previously we'd just looked at the connection type, but that's always CONN_TYPE_AP. Instead, we should be looking at the type of the listener that created the connection. Spotted by rransom; fixes bug 3636. Nick Mathewson2011-08-02
|/ / / / /
* | | | | For accuracy, s/exit_allows_optimistic_data/may_use_optimistic_data/Nick Mathewson2011-07-20
* | | | | Add an OptimisticData option to control client-side optimistic dataNick Mathewson2011-07-20
* | | | | Merge branch 'optimistic-client'•••The conflicts are with the proposal 171 circuit isolation code, and they're all trivial: they're just a matter of both branches adding some unrelated code in the same places. Conflicts: src/or/circuituse.c src/or/connection.c Nick Mathewson2011-07-20
|\ \ \ \ \