Commit Graph

  • 065b74fa36 Fix all nonconformant headers' guard macros. Nick Mathewson 2019-03-12 15:20:22 -04:00
  • 95209be861 Make checkSpace.pl check guard macros: Nick Mathewson 2019-03-12 15:19:28 -04:00
  • ea84d62bc2 Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-03-12 14:22:08 -04:00
  • cd52e13946 Merge branch 'maint-0.4.0' Nick Mathewson 2019-03-12 14:22:08 -04:00
  • ec2a2a6b7a Fix #28525 changes file that is breaking CI. George Kadianakis 2019-03-12 20:11:51 +02:00
  • ab34f49be9 Merge branch 'maint-0.4.0' into release-0.4.0 George Kadianakis 2019-03-12 18:11:53 +02:00
  • 18a4f535d3 Merge branch 'maint-0.4.0' George Kadianakis 2019-03-12 18:11:53 +02:00
  • 0ce32affc2 Merge branch 'tor-github/pr/763' into maint-0.4.0 George Kadianakis 2019-03-12 18:11:35 +02:00
  • 61adcb22c5 Merge branch 'bug23576-041-rebased-squashed' Nick Mathewson 2019-03-12 11:10:01 -04:00
  • 680b2afd84 hs: abolish hs_desc_link_specifier_dup() teor 2019-03-08 16:47:20 +10:00
  • 257cea8876 test/hs: minor hs test fixes teor 2019-01-30 21:52:19 +01:00
  • bb98bc8562 hs: abolish hs_desc_link_specifier_t teor 2018-08-23 19:21:26 +10:00
  • c01c6123fa Merge remote-tracking branch 'tor-github/pr/779' Nick Mathewson 2019-03-12 11:05:27 -04:00
  • feda2231a2 Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-03-12 11:03:47 -04:00
  • 1c9b629284 Merge branch 'maint-0.4.0' Nick Mathewson 2019-03-12 11:03:47 -04:00
  • 9c9214f2c9 Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0 Nick Mathewson 2019-03-12 11:03:37 -04:00
  • a6dd893e76 Fix shellcheck warnings in pull-all/merge-all scripts Nick Mathewson 2019-03-12 10:50:54 -04:00
  • 34b562b783 Remove linux-tor-prio.sh from include.am rl1987 2019-03-12 12:24:23 +02:00
  • e52653e01a USe uintptr_t for unsigned ints rl1987 2019-03-12 12:14:22 +02:00
  • 052ec08a08 Refrain from doing exhaustive iteration over all values of integers rl1987 2019-03-12 12:01:26 +02:00
  • dfc3e552a3 test/sr: update sr_state_free() to sr_state_free_all() teor 2019-03-12 11:34:52 +10:00
  • c7854933e9 Merge branch bug29706_029_refactor into bug29706_034_refactor teor 2019-03-12 11:31:52 +10:00
  • 9eeff921ae sr: BUG() on NULL sr_state before doing a state_query_*() teor 2019-03-12 11:09:48 +10:00
  • 0cca554110 sr: Check for replacing a SRV pointer with the same pointer teor 2019-03-12 10:24:34 +10:00
  • d1a1be822e Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-03-11 09:45:48 -04:00
  • 733afb52a8 Merge branch 'maint-0.4.0' Nick Mathewson 2019-03-11 09:45:48 -04:00
  • a9c84bfd35 Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0 Nick Mathewson 2019-03-11 09:45:31 -04:00
  • 134a640a91 Remove linux-tor-prio.sh script rl1987 2019-03-10 19:12:47 +02:00
  • 0befdb8a35 Disable git diff pagination rl1987 2019-03-08 18:50:49 +02:00
  • 537692c1e3 Using diff -u in check_for_diffs rl1987 2019-03-06 19:55:38 +02:00
  • 5f253f6a47 Iterate over contents of scripts/git with check_for_script_update function rl1987 2019-03-06 19:53:50 +02:00
  • 888bb9508b Move all git maintenance scripts to separate directory rl1987 2019-03-06 19:45:58 +02:00
  • 7b5f31f2d6 Mention what file has changed rl1987 2019-03-06 19:42:29 +02:00
  • 73fed3ee1c Add changes file rl1987 2019-03-01 18:01:24 +02:00
  • 88633fad5b Write a comment for post-merge.git-hook rl1987 2019-03-01 17:58:10 +02:00
  • bb8b2f47d0 Also print changes in git helper scripts, if any rl1987 2019-03-01 17:54:54 +02:00
  • 2d3ef34dce Add post-merge git hook to warn about git hooks being updated in the repo rl1987 2019-03-01 17:38:37 +02:00
  • 4773fa6474 Revert "Walk back from requiring bash" rl1987 2019-03-10 18:16:58 +02:00
  • 593fde930f sr: rename srv_dup() to sr_srv_dup() teor 2019-03-09 11:48:05 +10:00
  • 26e6f56023 sr: Free SRVs before replacing them in state_query_put_() teor 2019-03-09 10:50:55 +10:00
  • 9400da9b5e test/sr: Free SRVs before replacing them in test_sr_setup_srv() teor 2019-03-09 10:50:07 +10:00
  • 31a9caa274 Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-03-08 10:25:57 -05:00
  • 911f95ed92 Merge branch 'maint-0.4.0' Nick Mathewson 2019-03-08 10:25:57 -05:00
  • c40d53ab39 Merge branch 'pr_719_squashed_040' into maint-0.4.0 Nick Mathewson 2019-03-08 10:25:43 -05:00
  • ff410edec0 Bug 29204: Inspect circuit queues before sending padding. Mike Perry 2019-02-21 01:34:55 +00:00
  • e47e60c12e Merge branch 'pr_719_squashed' Nick Mathewson 2019-03-08 10:24:00 -05:00
  • cd67911033 Bug 29204: Inspect circuit queues before sending padding. Mike Perry 2019-02-21 01:34:55 +00:00
  • 8fd20df455 Merge remote-tracking branch 'tor-github/pr/743' Nick Mathewson 2019-03-08 10:07:25 -05:00
  • b4e44a371f hs-v2: Copy needed information between service on prunning David Goulet 2019-03-08 09:54:54 -05:00
  • e91b999cf2 Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes teor 2019-03-08 19:37:18 +10:00
  • df279880f8 Merge branch 'maint-0.4.0' teor 2019-03-08 14:12:00 +10:00
  • 20a25b1cad Merge branch 'maint-0.4.0' into release-0.4.0 teor 2019-03-08 14:11:53 +10:00
  • 968d2b87cb Merge branch 'maint-0.3.5' into maint-0.4.0 teor 2019-03-08 14:11:46 +10:00
  • 7c70d5a1b2 Merge branch 'maint-0.3.5' into release-0.3.5 teor 2019-03-08 14:11:39 +10:00
  • ffd7207025 Merge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5 teor 2019-03-08 14:11:14 +10:00
  • 08ddf1f62b Merge remote-tracking branch 'bug28525_029' into maint-0.3.5 teor 2019-03-08 12:32:04 +10:00
  • 63b4049114 Make tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware Neel Chauhan 2019-03-02 21:25:35 -05:00
  • d3fc9aef93 Merge branch 'maint-0.4.0' Nick Mathewson 2019-03-07 08:57:02 -05:00
  • 1128eec836 Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-03-07 08:57:00 -05:00
  • 3af943dcd1 Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0 Nick Mathewson 2019-03-07 08:56:35 -05:00
  • 82e1ec4087 Merge branch 'maint-0.4.0' Nick Mathewson 2019-03-07 08:34:46 -05:00
  • 9152692b99 Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-03-07 08:34:44 -05:00
  • d8409ccb76 Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0 Nick Mathewson 2019-03-07 08:34:15 -05:00
  • 918bda25ad Merge branch 'maint-0.4.0' Nick Mathewson 2019-03-06 14:29:48 -05:00
  • 5c78bd3224 Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-03-06 14:29:45 -05:00
  • 9b4ecbaa7d Merge branch 'maint-0.3.5' into maint-0.4.0 Nick Mathewson 2019-03-06 14:29:43 -05:00
  • ebb71fcff6 Merge branch 'maint-0.3.5' into release-0.3.5 Nick Mathewson 2019-03-06 14:29:41 -05:00
  • d6f77b99da Merge branch 'maint-0.3.4' into maint-0.3.5 Nick Mathewson 2019-03-06 14:29:38 -05:00
  • 6a34215460 Merge branch 'maint-0.3.4' into release-0.3.4 Nick Mathewson 2019-03-06 14:29:36 -05:00
  • 155b0f5521 Merge branch 'maint-0.3.3' into maint-0.3.4 Nick Mathewson 2019-03-06 14:29:33 -05:00
  • 0e74894c5d Merge branch 'maint-0.3.3' into release-0.3.3 release-0.3.3 Nick Mathewson 2019-03-06 14:29:31 -05:00
  • 0c9cd7c487 Merge branch 'maint-0.2.9' into maint-0.3.3 maint-0.3.3 Nick Mathewson 2019-03-06 14:29:29 -05:00
  • 8cdb8f97ae Merge branch 'maint-0.2.9' into release-0.2.9 Nick Mathewson 2019-03-06 14:29:26 -05:00
  • 2e74edb53e Update geoip and geoip6 to the March 4 2019 database. Karsten Loesing 2019-03-06 11:45:27 +01:00
  • db2e916afe Merge branch 'tor-github/pr/717' David Goulet 2019-03-05 14:26:59 -05:00
  • 7f0516022b Also disallow pushing to/from upstream branch when branch names do not match rl1987 2019-02-22 17:05:07 +02:00
  • 0deea98d02 Improve pre-push.git-hook description rl1987 2019-02-20 19:56:37 +02:00
  • f3eac74ed9 In pre-push hook script, actually check local and remote refs rl1987 2019-02-20 19:48:52 +02:00
  • ae5a0f39cd Update git pre-push hook so that only upstream branches can get pushed to origin rl1987 2019-02-20 09:35:27 +02:00
  • f1890707cc Merge branch 'maint-0.4.0' Nick Mathewson 2019-03-05 13:00:07 -05:00
  • ea1de84432 Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-03-05 13:00:05 -05:00
  • a999cb43df protover: Add missing Padding to translate_to_rust David Goulet 2019-03-01 13:50:00 -05:00
  • d24acc008d Merge remote-tracking branch 'tor-github/pr/759' Nick Mathewson 2019-03-05 12:01:28 -05:00
  • f8e38d21c2 Merge remote-tracking branch 'tor-github/pr/753' Nick Mathewson 2019-03-05 11:57:20 -05:00
  • 72751f0c30 Merge remote-tracking branch 'tor-github/pr/680' Nick Mathewson 2019-03-05 11:53:31 -05:00
  • c9a9de120f Fix changelog for ticket 25614 to make it pass check-changes. Alexander Færøy 2019-03-05 15:50:30 +01:00
  • b6813845cf Also add tor_assertf_nonfatal() rl1987 2019-03-05 16:37:14 +02:00
  • f236c9e7f9 Introduce tor_assertf() to allow logging extra error message on assert failure rl1987 2018-03-18 14:56:59 +01:00
  • 4578c3eb21 Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too. David Fifield 2019-02-22 23:54:17 -07:00
  • c5da1f1cd5 Merge branch 'tor-github/pr/723' George Kadianakis 2019-03-04 18:55:28 +02:00
  • fe2552ad65 Merge branch 'tor-github/pr/739' George Kadianakis 2019-03-04 18:52:19 +02:00
  • f186f21a4e doc: Fix an incorrect comment about calling FreeLibrary() on Windows teor 2019-03-04 11:22:02 +10:00
  • e52d725977 doc: Improve the monotonic time module and function documentation teor 2019-03-04 11:21:15 +10:00
  • 27eec50527 manpage: fix formatting of example on quoting options with spaces rl1987 2019-03-03 11:51:08 +02:00
  • 5d53862139 Split crypto_digest.c rl1987 2019-01-18 12:26:13 +02:00
  • 13e93bdfd5 Merge branch 'tor-github/pr/718' David Goulet 2019-03-01 09:36:23 -05:00
  • 436e0c8ca4 maint: Make git scripts fetch origin once David Goulet 2019-02-28 13:23:23 -05:00
  • cb0d403049 Merge remote-tracking branch 'tor-github/pr/677' Nick Mathewson 2019-03-01 08:22:43 -05:00
  • 64f594499a Document crypto_fast_rng_one_in_n. Nick Mathewson 2019-03-01 08:20:54 -05:00
  • 2d5c6cddc4 Merge branch 'maint-0.4.0' teor 2019-03-01 14:17:54 +10:00