Commit History

Author SHA1 Message Date
  Roger Dingledine 272265efbd clarify that tor's license is free software 4 years ago
  David Goulet d475d7c2fb Merge branch 'tor-github/pr/1244' 4 years ago
  Nick Mathewson cc48eff2d3 Merge branch 'ticket31176' into ticket31176_merged 4 years ago
  Nick Mathewson edf5a327c5 Merge branch 'ticket30914' into ticket30914_merged 4 years ago
  Nick Mathewson 4b1e0dd5b5 remove changes files already contained in 0.4.1.5 4 years ago
  Nick Mathewson 6b180703a2 Merge branch 'maint-0.4.1' 4 years ago
  Nick Mathewson 3b2a732073 bump to 0.4.1.5-dev 4 years ago
  Nick Mathewson d0b62fff05 forward-port the changelog and release notes for 0.4.1.5 4 years ago
  Nick Mathewson 36a27fa2d3 Merge branch 'maint-0.4.1' 4 years ago
  Nick Mathewson ab92881d9a Update version to 0.4.1.5 4 years ago
  Nick Mathewson e5812c91d6 Merge remote-tracking branch 'tor-github/pr/1231' 4 years ago
  Nick Mathewson 29bd43ab03 Merge remote-tracking branch 'tor-github/pr/1224' 4 years ago
  Nick Mathewson b51a822a80 Merge remote-tracking branch 'tor-github/pr/1160' 4 years ago
  Nick Mathewson 78d2559d85 Merge branch 'maint-0.4.1' 4 years ago
  Nick Mathewson 6a89b01049 Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1 4 years ago
  Nick Mathewson e7aabfce61 Merge remote-tracking branch 'tor-github/pr/1235' 4 years ago
  Nick Mathewson deccd3aa6a Merge remote-tracking branch 'tor-github/pr/1225' 4 years ago
  George Kadianakis 60adebc499 Merge branch 'tor-github/pr/1217' 4 years ago
  George Kadianakis 4185ef29fd Merge branch 'tor-github/pr/1122' 4 years ago
  George Kadianakis af7cf7d5c1 Merge branch 'tor-github/pr/1233' 4 years ago
  George Kadianakis dfc8c0b536 Merge branch 'tor-github/pr/1214' 4 years ago
  George Kadianakis 19e19c1fa8 Merge branch 'tor-github/pr/1154' 4 years ago
  George Kadianakis e411fcabd7 Merge branch 'tor-github/pr/1220' 4 years ago
  George Kadianakis b257e8e553 Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final 4 years ago
  Nick Mathewson c214402a56 Merge branch 'maint-0.4.1' 4 years ago
  Nick Mathewson bba64c9882 Merge branch 'maint-0.4.0' into maint-0.4.1 4 years ago
  Nick Mathewson 90f4ed2335 Merge branch 'maint-0.3.5' into maint-0.4.0 4 years ago
  Nick Mathewson 5653b93a1d Merge branch 'maint-0.2.9' into maint-0.3.5 4 years ago
  David Goulet a8e6eab379 Merge branch 'tor-github/pr/1213' 4 years ago
  David Goulet 81e37b81f1 practracker: Make exceptions.txt happy 4 years ago