Commit History

Author SHA1 Message Date
  Nick Mathewson 702a13c9d3 Merge branch 'maint-0.3.2' 7 years ago
  Nick Mathewson 6dc784bdb3 Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2 7 years ago
  George Kadianakis c4a56ed5c2 Silence a warning about failed descriptor uploads. 7 years ago
  Nick Mathewson 9f2efd02a1 Minimal implementation of bridge-distribution-request 7 years ago
  Nick Mathewson 1d5e693b63 Merge branch 'maint-0.3.0' into maint-0.3.1 7 years ago
  Nick Mathewson 50fbede459 Merge branch 'maint-0.2.9' into maint-0.3.0 7 years ago
  Nick Mathewson fe04a19cb7 Merge branch 'maint-0.3.2' 7 years ago
  Nick Mathewson 6059784be0 Merge branch 'maint-0.3.1' into maint-0.3.2 7 years ago
  Nick Mathewson 1b9bb2c847 Merge branch 'bug22895_027' into maint-0.2.9 7 years ago
  Nick Mathewson 5a9b0374a0 Merge branch 'maint-0.3.2' 7 years ago
  Nick Mathewson 985c41b500 add a missing subcategory to 23637, again 7 years ago
  Nick Mathewson 562b3c9678 Merge branch 'maint-0.3.0' into maint-0.3.1 7 years ago
  Nick Mathewson fea5c8a015 Merge branch 'maint-0.2.9' into maint-0.3.0 7 years ago
  Nick Mathewson 543fd89fb7 Merge branch 'maint-0.2.8' into maint-0.2.9 7 years ago
  Nick Mathewson a5a87c1d97 Merge branch 'maint-0.3.2' 7 years ago
  Nick Mathewson 05ae995665 Merge branch 'maint-0.3.1' into maint-0.3.2 7 years ago
  Nick Mathewson 800797e7f3 Merge branch 'bug23291_028' into maint-0.2.8 7 years ago
  Nick Mathewson 0c6d05cdd4 Merge branch 'maint-0.3.2' 7 years ago
  Nick Mathewson d0b75b5ade Merge branch 'maint-0.3.1' into maint-0.3.2 7 years ago
  David Goulet 7df28ce299 hs-v3: Fix consensus param "hsdir-interval" name 7 years ago
  Nick Mathewson 527eb563cb Remove changes files for those items already merged in 0.3.2 7 years ago
  Nick Mathewson 0b4e59b7c6 Merge remote-tracking branch 'sebastian/bug24137' 7 years ago
  Nick Mathewson 45fb624e38 Merge branch 'maint-0.3.2' 7 years ago
  Nick Mathewson 3300a6e93a Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2 7 years ago
  Nick Mathewson e209e8e3c1 Merge branch 'maint-0.3.2' 7 years ago
  Nick Mathewson cf1e6ad2d7 Merge branch 'bug24247_032' into maint-0.3.2 7 years ago
  Nick Mathewson 16bdb9e365 Merge branch 'maint-0.2.9' into maint-0.3.0 7 years ago
  Nick Mathewson 91188540af Merge branch 'maint-0.3.0' into maint-0.3.1 7 years ago
  Nick Mathewson b9da340cdf Merge branch 'maint-0.3.2' 7 years ago
  Nick Mathewson 6f9ab69b6d Merge branch 'maint-0.3.1' into maint-0.3.2 7 years ago