summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-18Merge branch 'bug23512-v4-033' into bug23512-v4-masterMike Perry
2018-09-17Bug 23512: Test fix: cmux is now allocated by new_fake_channel()Mike Perry
2018-09-17Merge branch 'bug23512-v4-032' into bug23512-v4-033Mike Perry
2018-09-17Remove duplicate TLS define from kist code.Mike Perry
Duplicate comes from introducing this define into 0.2.9, which did not yet have KIST.
2018-09-17Bug 23512: Mock assert_circuit_ok in tests.Mike Perry
This mocking was not available in 0.2.9.
2018-09-17Merge branch 'bug23512-v4-029' into bug23512-v4-032Mike Perry
2018-09-17Bug 23512: Test recording bytes in circ queues.Mike Perry
2018-09-17Bug 23512: Changes file.Mike Perry
2018-09-17Bug 23512: Report queued cells on or circs as written.Mike Perry
This avoids asymmetry in our public relay stats, which can be exploited for guard discovery and other attacks.
2018-09-17Promote rep_hist bw functions to uint64_t.Mike Perry
The rest of rephist uses uint64_t internally. Let's make these take it too, so we don't have to worry about overflowing size_t on 32 bit systems.
2018-09-17More changelog editsNick Mathewson
2018-09-17Write a blurb, pull UI changes to the front, editNick Mathewson
2018-09-17Light edits on changelog. mostly combining sections.Nick Mathewson
2018-09-17Lower the maximum size of a private key file to 16 MBNick Mathewson
This shouldn't be a user-visible change: nobody has a 16 MB RSA key that they're trying to use with Tor. I'm doing this to fix CID 1439330 / ticket 27730, where coverity complains (on 64-bit) that we are making a comparison that is never true.
2018-09-17Bump to 0.3.5.1-alphaNick Mathewson
2018-09-17Start a changelog for 0.3.5.1-alphaNick Mathewson
2018-09-16Add tortls.h includes to expose critical macro. Fix #27734.Nick Mathewson
2018-09-16Don't try to link C from rust doctests for nss detectionNick Mathewson
This is really annoying, since we can't use cfg(test) for doctests.
2018-09-16Merge branch 'bug25573-034-typefix'Nick Mathewson
2018-09-16Fix duplicate declaration of pathbias_count_valid_cells.Nick Mathewson
2018-09-16When Tor is compiled with NSS, don't claim support for LinkAuth=1Nick Mathewson
Closes ticket 27288
2018-09-14Add a missing function for windowsNick Mathewson
2018-09-14Explicitly ignore BIO_set_close() return val to fix #27711Nick Mathewson
2018-09-14Merge branch 'maint-0.3.4'Nick Mathewson
2018-09-14Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-14hs-v3: Don't BUG() on directory permission check failureDavid Goulet
In hs_config.c, we do validate the permission of the hidden service directory but we do not try to create it. So, in the event that the directory doesn't exists, we end up in the loading key code path which checks for the permission and possibly creates the directory. On failure, don't BUG() since there is a perfectly valid use case for that function to fail. Fixes #27335 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-14Merge remote-tracking branch 'dgoulet/ticket27040_035_01'Nick Mathewson
2018-09-14Merge branch 'nss_countbytes_squashed'Nick Mathewson
2018-09-14Allow malloc includes in tls libraryNick Mathewson
2018-09-14Add support for lower-level byte counting with NSSNick Mathewson
This is harder than with OpenSSL, since OpenSSL counts the bytes on its own and NSS doesn't. To fix this, we need to define a new PRFileDesc layer that has its own byte-counting support. Closes ticket 27289.
2018-09-14hs-v2: Demote log warning to info when we don't have a consensusDavid Goulet
Fixes #27040 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-14Merge branch 'maint-0.3.4'Nick Mathewson
2018-09-14If options_act() fails, restore the previous value of global_optionsNick Mathewson
Before 0.3.3.1-alpha, we would exit() in this case immediately. But now that we leave tor_main() more conventionally, we need to make sure we restore things so as not to cause a double free. Fixes bug 27708; bugfix on 0.3.3.1-alpha.
2018-09-14Merge branch 'nss_27664'Nick Mathewson
2018-09-14Merge branch 'nss_27451'Nick Mathewson
2018-09-14Tweak changes file: call this a major feature.Nick Mathewson
2018-09-14Tweak message; only log it on a relay.Nick Mathewson
2018-09-14Merge remote-tracking branch 'neel/b21530'Nick Mathewson
2018-09-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-14Merge branch 'maint-0.3.4'Nick Mathewson
2018-09-14Merge remote-tracking branch 'onionk/rust-protokeyword1-035'Nick Mathewson
2018-09-14Merge remote-tracking branch 'tor-github/pr/329'Nick Mathewson
2018-09-14Merge branch 'ticket27247'Nick Mathewson
2018-09-14Re-order includes to expose intptr_t to tor_api_internal.hNick Mathewson
2018-09-14Merge branch 'rust-protokeyword1-034' into rust-protokeyword1-035cypherpunks
2018-09-14Merge branch 'rust-protokeyword1' into rust-protokeyword1-034cypherpunks
2018-09-13Add log message for Tor being non-exit by defaultNeel Chauhan
2018-09-13Include torint.h in socketpair.c for intptr_t definition.Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion