Commit History

Author SHA1 Message Date
  Nick Mathewson 85115796bb Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago
  Nick Mathewson eac4c374e4 Merge branch 'maint-0.2.9' into maint-0.3.0 6 years ago
  Nick Mathewson fcd5c3144a Merge branch 'maint-0.2.8' into maint-0.2.9 6 years ago
  Nick Mathewson a5f5bda462 Adjust test, now that there are 9 dirauths again 6 years ago
  Nick Mathewson 23e3d57e12 Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago
  Nick Mathewson c93ecb8189 Merge branch 'maint-0.2.9' into maint-0.3.0 6 years ago
  Nick Mathewson 1db5081ba1 Merge branch 'maint-0.2.8' into maint-0.2.9 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 df57d1e0c0 Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago
  Nick Mathewson 783e458c07 Merge branch 'maint-0.2.9' into maint-0.3.0 6 years ago
  Nick Mathewson c958fda6e2 Merge branch 'maint-0.2.8' into maint-0.2.9 6 years ago
  Nick Mathewson 9a1b385462 Merge branch 'maint-0.2.5' into maint-0.2.8 6 years ago
  Nick Mathewson b68de63eb6 Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago
  Nick Mathewson 74e8fd22c9 Merge branch 'maint-0.2.9' into maint-0.3.0 6 years ago
  Nick Mathewson 132e2f69b1 Merge branch 'maint-0.2.8' into maint-0.2.9 6 years ago
  Nick Mathewson 6f87a85897 Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8 6 years ago
  Nick Mathewson 9120ac2218 Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago
  Nick Mathewson 35574d4a9a Merge branch 'maint-0.2.9' into maint-0.3.0 6 years ago
  Nick Mathewson fcaf3335b4 Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9 6 years ago
  Nick Mathewson 5d37d27007 Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago
  Nick Mathewson d29e4c0597 Merge branch 'maint-0.2.9' into maint-0.3.0 6 years ago
  Nick Mathewson 68dea082e7 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 6 years ago
  Nick Mathewson 5d219ecf98 Update Longclaw's IP address; fixes 23592. 6 years ago
  Nick Mathewson 91c17ffbd6 Merge branch 'maint-0.2.5' into maint-0.2.8 6 years ago
  Nick Mathewson 7a4741c233 Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago
  Nick Mathewson f7f55acae9 Merge branch 'maint-0.2.9' into maint-0.3.0 6 years ago
  Nick Mathewson 43ebe54a24 Merge branch 'maint-0.2.8' into maint-0.2.9 6 years ago
  Nick Mathewson 2e21493a88 add missing subcategory in changes file 6 years ago
  Nick Mathewson bdf60fc7ce Merge branch 'maint-0.3.0' into maint-0.3.1 6 years ago