Commit History

Author SHA1 Message Date
  Nick Mathewson 8340f641c3 Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson d3a972561a Merge branch 'maint-0.2.9' into maint-0.3.1 6 years ago
  Nick Mathewson d1e4ffc710 Merge branch 'bug26072_029' into maint-0.2.9 6 years ago
  Nick Mathewson ddc3eb20b7 Merge branch 'bug26116_029' into bug26116_033 6 years ago
  Nick Mathewson 881f7157f6 Return -1 from our PEM password callback 6 years ago
  Nick Mathewson 6acbd4c112 Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago
  Nick Mathewson 4aa3d511b2 Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson 502d2c0062 Merge branch 'maint-0.2.9' into maint-0.3.1 6 years ago
  Karsten Loesing 033e4723f3 Update geoip and geoip6 to the May 1 2018 database. 6 years ago
  Nick Mathewson 5eb2d58880 Add a missing return after marking a stream for bad connected cell 6 years ago
  Nick Mathewson b343ba9060 Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago
  Nick Mathewson 7ee67c47fa Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson 2d61a83513 Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1 6 years ago
  Nick Mathewson f64fa6b19e Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago
  Nick Mathewson 15b8c860d3 Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson ba70439210 Merge branch 'maint-0.2.9' into maint-0.3.1 6 years ago
  Nick Mathewson edb6acf9ce Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 6 years ago
  David Goulet 6e99286d45 hs-v3: Add an extra white-space when parsing descriptor 6 years ago
  Nick Mathewson 59812789f7 Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago
  Nick Mathewson e5acbbd16d Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson aa08c19703 Merge branch 'maint-0.2.9' into maint-0.3.1 6 years ago
  David Goulet bca8a104b2 Having a ControlPort open doesn't mean we are a client 6 years ago
  juga0 dbdde76f56 Test read bandwidth measurements with empty file 6 years ago
  Nick Mathewson abde29824c Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago
  Nick Mathewson 394f102ea6 Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2 6 years ago
  teor 867fe40f91 Stop logging stack contents when reading a zero-length bandwidth file 6 years ago
  Nick Mathewson a639a67844 Merge branch 'libressl_201805_033' into maint-0.3.3 6 years ago
  George Kadianakis 7e8c5e3662 Detect when v3 services get disabled after HUP. 6 years ago
  George Kadianakis 5dc00c0661 Detect when v2 services get disabled after HUP. 6 years ago
  Roger Dingledine b979415e8b manpage fix to stop saying CacheIPv4DNS is on by default 6 years ago