Commit History

Author SHA1 Message Date
  George Kadianakis 4185ef29fd Merge branch 'tor-github/pr/1122' 6 years ago
  George Kadianakis af7cf7d5c1 Merge branch 'tor-github/pr/1233' 6 years ago
  George Kadianakis dfc8c0b536 Merge branch 'tor-github/pr/1214' 6 years ago
  George Kadianakis 19e19c1fa8 Merge branch 'tor-github/pr/1154' 6 years ago
  George Kadianakis e411fcabd7 Merge branch 'tor-github/pr/1220' 6 years ago
  Nick Mathewson c214402a56 Merge branch 'maint-0.4.1' 6 years ago
  Nick Mathewson bba64c9882 Merge branch 'maint-0.4.0' into maint-0.4.1 6 years ago
  Nick Mathewson 90f4ed2335 Merge branch 'maint-0.3.5' into maint-0.4.0 6 years ago
  Nick Mathewson 5653b93a1d Merge branch 'maint-0.2.9' into maint-0.3.5 6 years ago
  David Goulet a8e6eab379 Merge branch 'tor-github/pr/1213' 6 years ago
  David Goulet 81e37b81f1 practracker: Make exceptions.txt happy 6 years ago
  David Goulet 5a1c3e44f7 dirauth: Change dizum IP address 6 years ago
  teor e87e34099c Fix typos in HiddenServiceExportCircuitID 6 years ago
  Roger Dingledine 9b1aa9a572 fix typo in keypin journal log entry (for dir auths) 6 years ago
  teor c9841eb67e Merge branch 'maint-0.4.1' 6 years ago
  teor 6eb5a811d7 Merge branch 'maint-0.4.0' into maint-0.4.1 6 years ago
  teor 20943d00f1 Merge branch 'maint-0.3.5' into maint-0.4.0 6 years ago
  teor a1d8409ee2 Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0 6 years ago
  teor d253b31cec Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5 6 years ago
  teor 31fb2bceb5 Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5 6 years ago
  teor 789fdbed05 Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5 6 years ago
  teor a92b05392e Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5 6 years ago
  teor 224825e7ee Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5 6 years ago
  teor e5be039494 Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5 6 years ago
  teor f65f4b5c38 Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5 6 years ago
  teor 8ea0903222 Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5 6 years ago
  teor 6ed56ee4ea Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5 6 years ago
  teor 2d4772dc47 Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5 6 years ago
  teor ef345ab56d Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5 6 years ago
  teor 9be65c440b Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5 6 years ago