Commit History

Author SHA1 Message Date
  teor a0db5ade3e Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9 6 years ago
  teor e1955a2c54 Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9 6 years ago
  Nick Mathewson f021ca2d52 practracker: allow config.c to be a touch larger. 6 years ago
  George Kadianakis df4e2c42a8 Merge branch 'tor-github/pr/907' 6 years ago
  George Kadianakis 071a000d67 Merge branch 'tor-github/pr/906' into maint-0.4.0 6 years ago
  George Kadianakis 5584b6392d Merge branch 'maint-0.4.0' 6 years ago
  George Kadianakis 2cc3c98bc4 Merge branch 'tor-github/pr/901' into maint-0.4.0 6 years ago
  George Kadianakis 76f1763976 Merge branch 'maint-0.4.0' 6 years ago
  George Kadianakis 7fe169a500 Merge branch 'tor-github/pr/879' into maint-0.4.0 6 years ago
  George Kadianakis 3393c8d510 Merge branch 'maint-0.4.0' 6 years ago
  George Kadianakis 217db9efe1 Merge branch 'tor-github/pr/902' into maint-0.4.0 6 years ago
  George Kadianakis b371ea5b0e Merge branch 'tor-github/pr/761' 6 years ago
  George Kadianakis 574c207670 Merge branch 'maint-0.4.0' 6 years ago
  George Kadianakis 747b74c182 Merge branch 'tor-github/pr/800' into maint-0.4.0 6 years ago
  teor db71bceb40 Merge branch 'bug29036-29962-034' into bug29036-29962-035 6 years ago
  teor a514e02476 Merge branch 'bug29036-029' into bug29036-29962-034 6 years ago
  teor f0cd8f804f Makefile: actually, don't delete the gcno files 6 years ago
  teor e992c5e4bc Merge branch 'bug29500_040_monoinit_revert' into bug29500_master_monoinit 6 years ago
  teor 593b33608d Revert "test/circuitpadding: Delete circuitpadding_circuitsetup_machine()" 6 years ago
  teor da678213e0 circuitpadding: comment fixes 6 years ago
  teor 387d9448de test/circuitpadding: Delete circuitpadding_circuitsetup_machine() 6 years ago
  Mike Perry b733044f7a Bug #29500: Fix monotime mocking in circpad unittests. 6 years ago
  Mike Perry 28db7646ba Changes file for bug 29500. 6 years ago
  Mike Perry b027b06dbb Bug 29500: Start monotime at 1000 nsec. 6 years ago
  Mike Perry 1f48c6cd83 Bug 29500: Attempt to fix the tokens test. 6 years ago
  Nick Mathewson 1779878f9e Merge remote-tracking branch 'tor-github/pr/752' 6 years ago
  Nick Mathewson 0e7b34354a Merge branch 'maint-0.4.0' 6 years ago
  Nick Mathewson d016bbaa7d Merge branch 'bug29959_040_squashed' into maint-0.4.0 6 years ago
  teor 8e961b2174 bwauth: Actually include the bandwidth-file-digest in authority votes 6 years ago
  Nick Mathewson 76912bf140 Use an enum for inherit_result_out. 6 years ago