aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-11fix 'make dist' which was broken by ticket 18365's mergeRoger Dingledine
2016-05-11Merge remote-tracking branch 'public/bug18815'Nick Mathewson
2016-05-11Add changes file for ticket 16698Nick Mathewson
2016-05-11Merge branch 'maint-0.2.8'Roger Dingledine
2016-05-11Merge branch 'maint-0.2.7' into maint-0.2.8Roger Dingledine
2016-05-11unbreak the build (when warnings are enabled)Roger Dingledine
2016-05-11Merge branch 'ticket16698_v2'Nick Mathewson
2016-05-11Fix comment for directory_handle_command_getNick Mathewson
2016-05-11Merge branch 'pubsub_squashed'Nick Mathewson
2016-05-11Basic work on a publish/subscribe abstractionNick Mathewson
The goal here is to provide a way to decouple pieces of the code that want to learn "when something happens" from those that realize that it has happened. The implementation here consists of a generic backend, plus a set of macros to define and implement a set of type-safe frontends.
2016-05-11Merge remote-tracking branch 'arma/feature18760'Nick Mathewson
2016-05-11Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-11Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8Nick Mathewson
2016-05-11Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-11Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-05-11Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7Nick Mathewson
2016-05-11Fix out-of-bounds write during voting with duplicate ed25519 keysJohn Brooks
In dirserv_compute_performance_thresholds, we allocate arrays based on the length of 'routers', a list of routerinfo_t, but loop over the nodelist. The 'routers' list may be shorter when relays were filtered by routers_make_ed_keys_unique, leading to an out-of-bounds write on directory authorities. This bug was originally introduced in 26e89742, but it doesn't look possible to trigger until routers_make_ed_keys_unique was introduced in 13a31e72. Fixes bug 19032; bugfix on tor 0.2.8.2-alpha.
2016-05-11Confim we want certificates from fallbacksteor (Tim Wilson-Brown)
Comment-only change
2016-05-11Revert "Switch between fallback and authority when auth cert fetch fails"teor (Tim Wilson-Brown)
This reverts commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b.
2016-05-11Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-11Merge branch 'bug18761_028_squashed' into maint-0.2.8Nick Mathewson
2016-05-11Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN.Nick Mathewson
Closes ticket 18761. Also fix a whitespace issue.
2016-05-11Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-11Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8Nick Mathewson
2016-05-11Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-11Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-05-11Merge branch 'bug18841_1_025' into maint-0.2.7Nick Mathewson
2016-05-11Undefine _FORTIFY_SOURCE before defining it.Nick Mathewson
This makes our compilation options checks in autoconf work better on systems that already define _FORTIFY_SOURCE. Fixes at least one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from "trudokal".
2016-05-10Split directory_handle_command_get into subfunctions.Nick Mathewson
This was one of our longest functions, at 600 lines. It makes a nice table-driven URL-based function instead. The code is a bit ugly, it leave the indentation as it is in hopes of making pending directory.c changes easier to merge. Later we can clean up the indentation. Also, remove unused mallinfo export code from directory.c Closes ticket 16698
2016-05-10Switch between fallback and authority when auth cert fetch failsteor (Tim Wilson-Brown)
2016-05-10Use the consensus download schedule for authority certificatesteor (Tim Wilson-Brown)
Previously, we were using the generic schedule for some downloads, and the consensus schedule for others. Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha.
2016-05-09Merge remote-tracking branch 'arma/feature18998'Nick Mathewson
2016-05-09Stop being so strict about the payload length of "rendezvous1" cellsRoger Dingledine
We used to be locked in to the "tap" handshake length, and now we can handle better handshakes like "ntor". Resolves ticket 18998. I checked that relay_send_command_from_edge() behaves fine when you hand it a payload with length 0. Clients behave fine too, since current clients remain strict about the required length in the rendezvous2 cells. (Clients will want to become less strict once they have an alternate format that they're willing to receive.)
2016-05-09Add changes file for #15588John Brooks
2016-05-09Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-09Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-05-09Merge branch 'bug19008_027' into maint-0.2.7Nick Mathewson
2016-05-09Add "-c 1" to ping6 in test-network-allNick Mathewson
Fixes bug 19008. bugfix on 0.2.7.3-rc
2016-05-09Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-09Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-05-09Merge commit '1a065cea46a9c179d64d74d012f051135bc4725a' into maint-0.2.8Nick Mathewson
This is an merge of maint-0.2.7 as an "ours" merge to avoid taking the cherry-picked fix of 18490
2016-05-09Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-05-09Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-05-09Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-05-09Merge branch 'feature15588_squashed'Nick Mathewson
2016-05-09Move rend client name checks to one functionJohn Brooks
2016-05-09Add client auth for ADD_ONION servicesJohn Brooks
2016-05-09Add client auth to rend_service_add_ephemeralJohn Brooks
2016-05-09Move rend auth cookie en-/decoding to a functionJohn Brooks
Tor stores client authorization cookies in two slightly different forms. The service's client_keys file has the standard base64-encoded cookie, including two chars of padding. The hostname file and the client remove the two padding chars, and store an auth type flag in the unused bits. The distinction makes no sense. Refactor all decoding to use the same function, which will accept either form, and use a helper function for encoding the truncated format.
2016-05-09Merge branch 'timeouts_v2_squashed'Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion