Commit History

Author SHA1 Message Date
  rl1987 2d3ef34dce Add post-merge git hook to warn about git hooks being updated in the repo 6 years ago
  rl1987 4773fa6474 Revert "Walk back from requiring bash" 6 years ago
  teor 593fde930f sr: rename srv_dup() to sr_srv_dup() 6 years ago
  teor 26e6f56023 sr: Free SRVs before replacing them in state_query_put_() 6 years ago
  teor 9400da9b5e test/sr: Free SRVs before replacing them in test_sr_setup_srv() 6 years ago
  Nick Mathewson 911f95ed92 Merge branch 'maint-0.4.0' 6 years ago
  Nick Mathewson c40d53ab39 Merge branch 'pr_719_squashed_040' into maint-0.4.0 6 years ago
  Mike Perry ff410edec0 Bug 29204: Inspect circuit queues before sending padding. 7 years ago
  Nick Mathewson e47e60c12e Merge branch 'pr_719_squashed' 6 years ago
  Mike Perry cd67911033 Bug 29204: Inspect circuit queues before sending padding. 7 years ago
  Nick Mathewson 8fd20df455 Merge remote-tracking branch 'tor-github/pr/743' 6 years ago
  teor e91b999cf2 Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes 6 years ago
  teor df279880f8 Merge branch 'maint-0.4.0' 6 years ago
  teor 968d2b87cb Merge branch 'maint-0.3.5' into maint-0.4.0 6 years ago
  teor ffd7207025 Merge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5 6 years ago
  teor 08ddf1f62b Merge remote-tracking branch 'bug28525_029' into maint-0.3.5 6 years ago
  Neel Chauhan 63b4049114 Make tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware 6 years ago
  Nick Mathewson d3fc9aef93 Merge branch 'maint-0.4.0' 6 years ago
  Nick Mathewson 3af943dcd1 Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0 6 years ago
  Nick Mathewson 82e1ec4087 Merge branch 'maint-0.4.0' 6 years ago
  Nick Mathewson d8409ccb76 Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0 6 years ago
  Nick Mathewson 918bda25ad Merge branch 'maint-0.4.0' 6 years ago
  Nick Mathewson 9b4ecbaa7d Merge branch 'maint-0.3.5' into maint-0.4.0 6 years ago
  Nick Mathewson d6f77b99da Merge branch 'maint-0.3.4' into maint-0.3.5 6 years ago
  Nick Mathewson 155b0f5521 Merge branch 'maint-0.3.3' into maint-0.3.4 6 years ago
  Nick Mathewson 0c9cd7c487 Merge branch 'maint-0.2.9' into maint-0.3.3 6 years ago
  Karsten Loesing 2e74edb53e Update geoip and geoip6 to the March 4 2019 database. 6 years ago
  David Goulet db2e916afe Merge branch 'tor-github/pr/717' 6 years ago
  rl1987 7f0516022b Also disallow pushing to/from upstream branch when branch names do not match 7 years ago
  rl1987 0deea98d02 Improve pre-push.git-hook description 7 years ago