summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Reword requirement to set Myfamily correctlymyfamilySebastian Hahn2018-01-11
|
* On shutdown, mark openssl as uninitialized.Nick Mathewson2018-01-11
| | | | | This causes openssl to get completely reinitialized on startup, which is probably a good idea.
* Make the warnings about restarting tor in-process more scary.Nick Mathewson2018-01-11
|
* Merge branch 'restart_nocrash'Nick Mathewson2018-01-11
|\
| * Changes file and tor_api.h tweaks for 24581.Nick Mathewson2017-12-11
| |
| * Set DH parameters to NULL on shutdownNick Mathewson2017-12-11
| | | | | | | | | | | | If we don't do this, we will use freed memory on restart. Part of 24581.
| * Mark libevent unitialized on shutdown.Nick Mathewson2017-12-11
| | | | | | | | This is necessary so that we will reinitialize it on startup.
| * On exit, free the event_base and set its pointer to NULL.Nick Mathewson2017-12-11
| | | | | | | | | | | | | | | | When we didn't do this before, we'd have some still-reachable memory warnings, and we'd find ourselves crashing when we tried to reinitialize libevent. Part of 24581 (don't crash when restarting Tor in-process)
* | Merge branch 'simplify_transition_allowed'Nick Mathewson2018-01-11
|\ \
| * | Use same macros to simplify options_transition_affects_*Nick Mathewson2017-12-15
| | |
| * | Simplify the very repetitious options_transition_allowed()Nick Mathewson2017-12-15
| | |
* | | Merge branch 'bug24526_squashed'Nick Mathewson2018-01-11
|\ \ \
| * | | Note contactinfo and myfamily as required in more placesNick Mathewson2018-01-11
| | | | | | | | | | | | | | | | Includes a sentence from cypherpunks; for ticket 24526.
* | | | Add a blank line per dgoulet review.Nick Mathewson2018-01-11
| | | |
* | | | Merge branch 'bug24584'Nick Mathewson2018-01-11
|\ \ \ \
| * | | | Stop using event_base_once().Nick Mathewson2017-12-11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This function leaks memory when the event_base is freed before the event itself fires. That's not harmful, but it's annoying when trying to debug other memory leaks. Fixes bug 24584; bugfix on 0.2.8.1-alpha.
* | | | Merge remote-tracking branch 'ffmancera/github/bug24573'Nick Mathewson2018-01-11
|\ \ \ \
| * | | | Set IPv6 preferences for bridges even if there is no ri.Fernando Fernandez Mancera2018-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tor now sets IPv6 preferences on rewrite_node_address_for_bridge() even if there is only ri or rs. It always warns about them. Also Tor now sets the IPv6 address in rs as well as it sets the one in ri. Fixes #24572 on 9e9edf7 in 0.2.4.5-alpha. Fixes #24573 on c213f27 in 0.2.8.2-alpha. Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
* | | | | Merge branch 'bug24733_squashed_2'Nick Mathewson2018-01-10
|\ \ \ \ \
| * | | | | Document the alignment limitation of tor_free()Nick Mathewson2018-01-10
| | | | | |
| * | | | | Extract the raw_free() of ifc_buf into a new function.Nick Mathewson2018-01-10
| | | | | | | | | | | | | | | | | | | | | | | | Explain the problem more correctly.
| * | | | | Stop invoking undefined behaviour by using tor_free() on an unaligned pointerteor2018-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in get_interface_addresses_ioctl(). This pointer alignment issue exists on x86_64 macOS, but is unlikely to exist elsewhere. (i386 macOS only requires 4-byte alignment, and other OSs have 8-byte ints.) Fixes bug 24733; not in any released version of tor.
* | | | | | Merge remote-tracking branch 'ffmancera/github/bug24501'Nick Mathewson2018-01-10
|\ \ \ \ \ \
| * | | | | | Add some values to OOM log msg #24501Fernando Fernandez Mancera2017-12-20
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposing cell_queues_get_total_allocation(), buf_get_total_allocation(), tor_compress_get_total_allocation(), tor_compress_get_total_allocation() when hit MaxMemInQueues threshold. Fixes #24501 Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
* | | | | | Remove needless parenthesesNick Mathewson2018-01-10
| | | | | |
* | | | | | Merge remote-tracking branch 'teor/Bug-23966'Nick Mathewson2018-01-10
|\ \ \ \ \ \
| * | | | | | Changes file for ticket 23966.teor2017-12-30
| | | | | | |
| * | | | | | node_has_curve25519_onion_key() is refactored and duplicate code removedArunaMaurya221B2017-12-29
| | |/ / / / | |/| | | |
* | | | | | ticket 22145 changes fileNick Mathewson2018-01-10
| | | | | |
* | | | | | Merge remote-tracking branch 'teor/bug22145_032'Nick Mathewson2018-01-10
|\ \ \ \ \ \
| * | | | | | Update the man page to say that OutboundBindAddress* is ignored for DNSArunaMaurya221B2017-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation-only change. Closes ticket 22145. Patch by "aruna1234".
* | | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2018-01-09
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | "ours" merge to avoid version bump.
| * | | | | | | Increment version to 0.3.2.9-devNick Mathewson2018-01-09
| | | | | | | |
* | | | | | | | Forward-port changelog and releasenotes for 0.3.2.9Nick Mathewson2018-01-09
| | | | | | | |
* | | | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2018-01-08
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | "ours" merge to avoid version bump.
| * | | | | | | Increment version to 0.3.2.9Nick Mathewson2018-01-08
| | | | | | | |
* | | | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2018-01-08
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | There was a merge conflict on fallback_dirs.inc, which we resolve in favor of the newly generated version for #24801.
| * | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-01-08
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2018-01-08
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2018-01-08
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Add changes file for new fallback directory list.Nick Mathewson2018-01-08
| | | | | | | | | | |
| | | | * | | | | | | Add 7 other fallback dirs from teor's testsNick Mathewson2018-01-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc"
| | | | * | | | | | | Update the fallback_dirs.inc file: part 1Nick Mathewson2018-01-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan.
* | | | | | | | | | | Merge remote-tracking branch 'arma/bug24555'Nick Mathewson2018-01-08
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | avoid calling format_iso_time() with TIME_MAXRoger Dingledine2018-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we tried to move a descriptor from routerlist->old_routers back into the current routerlist, we were preparing a buffer with format_iso_time() on ri->cert_expiration_time, and doing it preemptively since router_add_to_routerlist() might free ri so we wouldn't be able to get at it later in the function. But if the descriptor we're moving doesn't have any ed signature, then its cert will be marked to expire at TIME_MAX, and handing TIME_MAX to format_iso_time() generates this log warning: correct_tm(): Bug: gmtime(9223372036854775807) failed with error Value too large for defined data type: Rounding down to 2037 The fix is to preemptively remember the expiry time, but only prepare the buffer if we know we're going to need it. Bugfix on commit a1b0a0b9, which came about as part of a fix for bug 20020, and which is not yet in any released version of Tor (hence no changes file).
* | | | | | | | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2018-01-08
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-01-08
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2018-01-08
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2018-01-08
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Merge branch 'maint-0.2.5' into maint-0.2.9Nick Mathewson2018-01-08
| | | | |\ \ \ \ \ \ \