summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-01-17Merge branch 'bug21074_029'Nick Mathewson
2018-01-17Add a cast to avoid a signed/unsigned comparisonNick Mathewson
2018-01-16fix a check-changes warningNick Mathewson
2018-01-16Merge branch 'bug21074_029'Nick Mathewson
2018-01-16Merge branch 'maint-0.3.2'Nick Mathewson
2018-01-16Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2Nick Mathewson
2018-01-16Merge branch 'stack_em_up'Nick Mathewson
2018-01-16Repair a crash bug in src/test/benchNick Mathewson
This was caused because of the new KeyDirectory and CacheDirectory options not being set. Bugfix on 0.3.3.0-alpha; not in any released Tor.
2018-01-16Update scan-build.sh to work with the latest clangalyzerNick Mathewson
2018-01-16Fix a (spurious) scan-build warning in test_introduce1_validation()Nick Mathewson
Since helper_create_introduce1_cell() checks "cell" for nullness, scan-build is concerned that test_introduce1_validation() dereferences it without checking it. So, add a check. Not backporting, since this is spurious, _and_ tests-only.
2018-01-12Remove a needless changefile. (Needless because bug not released.)Nick Mathewson
2018-01-12Merge remote-tracking branch 'ffmancera/bug24861'Nick Mathewson
2018-01-12Fix minGW compatibility issue with zu format specifier.Fernando Fernandez Mancera
Define TOR_PRIuSZ as minGW compiler doesn't support zu format specifier for size_t type. Fixes #24861 on ac9eebd. Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2018-01-11Merge branch 'maint-0.3.2'Nick Mathewson
2018-01-11Reword requirement to set Myfamily correctlySebastian Hahn
2018-01-11Note contactinfo and myfamily as required in more placesNick Mathewson
Includes a sentence from cypherpunks; for ticket 24526.
2018-01-11Merge remote-tracking branch 'sebastian/myfamily'Nick Mathewson
2018-01-11Merge branch 'bug24582'Nick Mathewson
2018-01-11Reword requirement to set Myfamily correctlySebastian Hahn
2018-01-11On shutdown, mark openssl as uninitialized.Nick Mathewson
This causes openssl to get completely reinitialized on startup, which is probably a good idea.
2018-01-11Make the warnings about restarting tor in-process more scary.Nick Mathewson
2018-01-11Merge branch 'restart_nocrash'Nick Mathewson
2018-01-11Merge branch 'simplify_transition_allowed'Nick Mathewson
2018-01-11Merge branch 'bug24526_squashed'Nick Mathewson
2018-01-11Note contactinfo and myfamily as required in more placesNick Mathewson
Includes a sentence from cypherpunks; for ticket 24526.
2018-01-11Add a blank line per dgoulet review.Nick Mathewson
2018-01-11Merge branch 'bug24584'Nick Mathewson
2018-01-11Compute flavor name before dereference, to avoid a STACK warning.Nick Mathewson
(See 24423)
2018-01-11Merge remote-tracking branch 'ffmancera/github/bug24573'Nick Mathewson
2018-01-10Merge branch 'bug24733_squashed_2'Nick Mathewson
2018-01-10Document the alignment limitation of tor_free()Nick Mathewson
2018-01-10Extract the raw_free() of ifc_buf into a new function.Nick Mathewson
Explain the problem more correctly.
2018-01-10Stop invoking undefined behaviour by using tor_free() on an unaligned pointerteor
... 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.
2018-01-10Merge remote-tracking branch 'ffmancera/github/bug24501'Nick Mathewson
2018-01-10Remove needless parenthesesNick Mathewson
2018-01-10Merge remote-tracking branch 'teor/Bug-23966'Nick Mathewson
2018-01-10ticket 22145 changes fileNick Mathewson
2018-01-10Merge remote-tracking branch 'teor/bug22145_032'Nick Mathewson
2018-01-09Merge branch 'maint-0.3.2'Nick Mathewson
"ours" merge to avoid version bump.
2018-01-09Increment version to 0.3.2.9-devNick Mathewson
2018-01-09Forward-port changelog and releasenotes for 0.3.2.9Nick Mathewson
2018-01-08Merge branch 'maint-0.3.2'Nick Mathewson
"ours" merge to avoid version bump.
2018-01-08Increment version to 0.3.2.9Nick Mathewson
2018-01-08Merge branch 'maint-0.3.2'Nick Mathewson
There was a merge conflict on fallback_dirs.inc, which we resolve in favor of the newly generated version for #24801.
2018-01-08Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-01-08Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2018-01-08Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2018-01-08Add changes file for new fallback directory list.Nick Mathewson
2018-01-08Add 7 other fallback dirs from teor's testsNick Mathewson
These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc"
2018-01-08Update the fallback_dirs.inc file: part 1Nick Mathewson
This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion