Commit History

Author SHA1 Message Date
  Nick Mathewson 6ce8cc5dbb Merge branch 'maint-0.2.9' into maint-0.3.0 7 years ago
  Nick Mathewson 151d5ededf Merge branch 'maint-0.2.8' into maint-0.2.9 7 years ago
  Nick Mathewson faf568fa7e Merge branch 'maint-0.2.5' into maint-0.2.8 7 years ago
  Nick Mathewson f68c1b1406 bump to 0.3.1.8-dev 7 years ago
  Nick Mathewson 4edbbee2fd bump to 0.3.0.12-dev 7 years ago
  Nick Mathewson 46091a88ca bump to 0.2.9.13-dev 7 years ago
  Nick Mathewson 9969b0dfda bump to 0.2.8.16-dev 7 years ago
  Nick Mathewson 82f8b27ff5 bump to 0.2.5.15-dev 7 years ago
  Nick Mathewson e7126a1030 Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2 7 years ago
  Nick Mathewson b95ef19a77 Merge branch 'feature18329_029_squashed' into maint-0.3.2 7 years ago
  Nick Mathewson 594cf92498 Merge branch 'feature18329_029_squashed' into maint-0.3.2 7 years ago
  Nick Mathewson f3af74ccf5 Updates to fix check-spaces/check-changes warnings 7 years ago
  Nick Mathewson 44e8aaa9aa Adjust test to allow hyphens too. 7 years ago
  Isis Lovecruft 02cde0d939 test: Add unittest for descriptors with BridgeDistribution option. 7 years ago
  Isis Lovecruft b0e10f23ba doc: Improve documentation for check_bridge_distribution_setting(). 7 years ago
  Nick Mathewson 613b18f0af Always set bridge-distribution-request on bridges' descriptors. 7 years ago
  Nick Mathewson 3581f93d27 Tweak the documentation for BridgeDistribution 7 years ago
  Roger Dingledine ebab521525 Add new BridgeDistribution config option 7 years ago
  Taylor Yu 9b60acd4d4 Rewrite bridge addresses earlier 7 years ago
  Nick Mathewson 122a7f8848 Merge branch 'maint-0.3.1' into maint-0.3.2 7 years ago
  Nick Mathewson 990322fca4 Merge branch 'maint-0.3.0' into maint-0.3.1 7 years ago
  Nick Mathewson 7bebd1b025 Merge branch 'maint-0.2.9' into maint-0.3.0 7 years ago
  Nick Mathewson 5325e7ccab bump version in the other places :/ 7 years ago
  Nick Mathewson 552b620280 bump version in the other places :/ 7 years ago
  Nick Mathewson cce1a6efa6 Merge branch 'maint-0.3.1' into maint-0.3.2 7 years ago
  Nick Mathewson 38a58076e9 Merge branch 'maint-0.3.0' into maint-0.3.1 7 years ago
  Nick Mathewson 302b5f577d Merge branch 'maint-0.2.9' into maint-0.3.0 7 years ago
  Nick Mathewson 725f237104 Merge branch 'maint-0.2.8' into maint-0.2.9 7 years ago
  Nick Mathewson 912ebf165f Merge branch 'maint-0.2.5' into maint-0.2.8 7 years ago
  Nick Mathewson cbb41ddfef bump to 0.3.1.8 7 years ago