Commit History

Author SHA1 Message Date
  Nick Mathewson 0db5c54957 Merge branch 'nss_squashed' into nss_merge 6 years ago
  Nick Mathewson 3b10108a2a Fix documentation of ENABLE_NSS 6 years ago
  Nick Mathewson 48632455a5 Merge branch 'bug26367_035_01' 6 years ago
  David Goulet 4976eca826 hs: Render obsolete Tor2web 6 years ago
  Nick Mathewson 4c1c818ffa Update to 0.3.4.7-rc-dev 6 years ago
  Nick Mathewson 4748fd23da Bump to 0.3.4.7-rc 6 years ago
  Nick Mathewson 6a88d8f6b4 When enabling NSS, disable OpenSSL. 6 years ago
  Nick Mathewson 571cb2f662 Merge branch 'maint-0.3.3' into maint-0.3.4 6 years ago
  Nick Mathewson 0fc171a47b Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago
  Nick Mathewson 34083f00ab Merge branch 'maint-0.3.4' 6 years ago
  Nick Mathewson a26a2735b9 Merge branch 'maint-0.2.9' into maint-0.3.2 6 years ago
  Nick Mathewson 6c1d2549df Merge branch 'maint-0.3.3' into maint-0.3.4 6 years ago
  Nick Mathewson 26f1167e71 Merge branch 'bug26779_033' into bug26779_035 6 years ago
  Nick Mathewson b66386865e Detect broken stdatomic.h, and pretend that it isn't there at all 6 years ago
  Nick Mathewson 7a570b8182 Don't search for -lpthread on Windows 6 years ago
  Nick Mathewson de129e69ba Update version to 0.3.4.6-rc-dev 6 years ago
  Nick Mathewson a8bab72c37 Bump to 0.3.4.6-rc 6 years ago
  Nick Mathewson f90c053377 Update AC_WARN->AC_MSG_WARN. #23878. 6 years ago
  Nick Mathewson 5597ddc360 Mark openbsd-malloc as deprecated 6 years ago
  Nick Mathewson bb1f294232 Merge branch 'with_malloc_squashed' 6 years ago
  Nick Mathewson abde9fb426 Add a --with-malloc option. 6 years ago
  Nick Mathewson 2a6c1585b0 Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago
  Nick Mathewson 4856a6e6c4 Merge branch 'maint-0.2.9' into maint-0.3.2 6 years ago
  Nick Mathewson be8e56c231 Merge branch 'maint-0.3.3' into maint-0.3.4 6 years ago
  Nick Mathewson ae157b79e7 Merge branch 'maint-0.3.4' 6 years ago
  Nick Mathewson fdaa483098 Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged 6 years ago
  Nick Mathewson 01c73711f1 Merge branch 'maint-0.3.4' 6 years ago
  Nick Mathewson bcce3e7e0b Merge branch 'maint-0.3.3' into maint-0.3.4 6 years ago
  Nick Mathewson 373b23a9ee Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3 6 years ago
  Nick Mathewson d102e9c2e4 Merge branch 'maint-0.3.3' into maint-0.3.4 6 years ago