Commit History

Author SHA1 Message Date
  Nick Mathewson a770e1cc22 Merge remote-tracking branch 'origin/maint-0.2.4' 12 years ago
  Nick Mathewson 57ffef3f89 Remove an unused local variable. 12 years ago
  Nick Mathewson 3894efc760 Merge branch 'bug8206_squashed' into maint-0.2.4 12 years ago
  Nick Mathewson 63b67577d6 Check return values from fcntl and setsockopt 12 years ago
  Nick Mathewson 3fa9c9b688 Merge remote-tracking branch 'origin/maint-0.2.4' 12 years ago
  Nick Mathewson eb9420082d Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 support 12 years ago
  Nick Mathewson f48daef299 Merge remote-tracking branch 'origin/maint-0.2.4' 12 years ago
  Nick Mathewson 8b4728ebd6 Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4 12 years ago
  Nick Mathewson 686aaa5c4c Upgrade the warn for EntryNodes without UseEntryGuards to an error 12 years ago
  Nick Mathewson b163e801bc Merge remote-tracking branch 'origin/maint-0.2.4' 12 years ago
  Nick Mathewson 0cf327dc78 Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4 12 years ago
  Nick Mathewson e4d2177d31 Fix some basic socket issues with tor-fw-helper-natpmp on windows 12 years ago
  Nick Mathewson 18da1e0cf2 Remove incentives.txt from tor git; putting it into torspec. 12 years ago
  David Fifield a0b92cd800 Fix brackets in tor-fw-helper help output. 13 years ago
  Nick Mathewson ed600832d9 Merge remote-tracking branch 'origin/maint-0.2.4' 12 years ago
  Nick Mathewson aa051b7573 Improve asciidoc-helper's suggestion of what to install 12 years ago
  Nick Mathewson 2810753928 Merge remote-tracking branch 'origin/maint-0.2.4' 12 years ago
  Nick Mathewson 10fb339808 Be explicit that we want not only nacl but nacl-with-a-fast-curve25519 12 years ago
  Nick Mathewson 9be3389dc7 Merge remote-tracking branch 'origin/maint-0.2.4' 12 years ago
  Nick Mathewson 653b09e1ec Make circuit_purpose_to_string handle CIRCUIT_PURPOSE_PATH_BIAS_TESTING 12 years ago
  Nick Mathewson 051b1e8ac4 Look at the right variable when warning about signed size_t. 12 years ago
  Nick Mathewson d89b8e0751 Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013' 12 years ago
  Nick Mathewson 2a02efb601 Merge remote-tracking branch 'origin/maint-0.2.4' 12 years ago
  Nick Mathewson ef4db31693 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 12 years ago
  Nick Mathewson c6ca199888 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 12 years ago
  Roger Dingledine 331e4dcb46 Merge branch 'maint-0.2.4' 12 years ago
  Roger Dingledine 0196647970 start part-way through the ssl cert lifetime 12 years ago
  Roger Dingledine edd6f02273 randomize SSLKeyLifetime by default 12 years ago
  Roger Dingledine 599aeef9bc parameterize SSLKeyLifetime 12 years ago
  Nick Mathewson aa3126b5b4 Merge remote-tracking branch 'origin/maint-0.2.4' 12 years ago