Commit History

Author SHA1 Message Date
  Nick Mathewson b76a161e01 Merge branch 'fix-torrcd-sandbox-22605v2' 6 years ago
  Neel Chauhan b70e11ef6b Add code for letting user select Reduced Exit Policy 6 years ago
  Nick Mathewson 5a21b27083 Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago
  Nick Mathewson f2e23d38ab Merge branch 'maint-0.2.9' into maint-0.3.0 6 years ago
  Nick Mathewson 7c59c751b0 Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson cf98ca715c Merge branch 'maint-0.3.2' 6 years ago
  Nick Mathewson 04d4786cc4 Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9 6 years ago
  Nick Mathewson 30a681553f Merge remote-tracking branch 'public/exit_carefully' 6 years ago
  Nick Mathewson 8d908b961f Merge branch 'maint-0.3.2' 6 years ago
  Nick Mathewson 594cf92498 Merge branch 'feature18329_029_squashed' into maint-0.3.2 6 years ago
  Isis Lovecruft 02cde0d939 test: Add unittest for descriptors with BridgeDistribution option. 6 years ago
  Isis Lovecruft b0e10f23ba doc: Improve documentation for check_bridge_distribution_setting(). 6 years ago
  Nick Mathewson 613b18f0af Always set bridge-distribution-request on bridges' descriptors. 6 years ago
  Roger Dingledine ebab521525 Add new BridgeDistribution config option 7 years ago
  Nick Mathewson abbd6a36fc Merge branch 'maint-0.3.2' 6 years ago
  Nick Mathewson 48ee85e0c6 Have LOG_PROTOCOL_WARN call its own function 6 years ago
  Nick Mathewson 1db5081ba1 Merge branch 'maint-0.2.8' into maint-0.2.9 6 years ago
  Nick Mathewson c93ecb8189 Merge branch 'maint-0.2.9' into maint-0.3.0 6 years ago
  Nick Mathewson d99c6b7252 Merge branch 'maint-0.3.2' 6 years ago
  Nick Mathewson 009141c6a8 Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson 23e3d57e12 Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago
  Nick Mathewson 8cc147aa83 Merge branch 'maint-0.2.5' into maint-0.2.8 6 years ago
  David Goulet 15a699462d dirauth: Add bastet to the default authorities 6 years ago
  Nick Mathewson 97046436b2 Merge branch 'maint-0.3.2' 6 years ago
  Nick Mathewson c958fda6e2 Merge branch 'maint-0.2.8' into maint-0.2.9 6 years ago
  Nick Mathewson 783e458c07 Merge branch 'maint-0.2.9' into maint-0.3.0 6 years ago
  Nick Mathewson b8dedaee74 Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson df57d1e0c0 Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago
  Nick Mathewson 9a1b385462 Merge branch 'maint-0.2.5' into maint-0.2.8 6 years ago
  Nick Mathewson a62f59f000 Mark "previously validated foo could not be set" blocks as unreachable. 6 years ago