Commit History

Author SHA1 Message Date
  Nick Mathewson 049ba66746 Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago
  Nick Mathewson 286d02995f Merge branch 'maint-0.3.3' 6 years ago
  Nick Mathewson 6017447e3a Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson 94f3007627 Merge branch 'bug26158_031' into maint-0.3.1 6 years ago
  Nick Mathewson 1c80eb92fa Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago
  Nick Mathewson 76e9de7c6d Merge branch 'maint-0.3.3' 6 years ago
  Nick Mathewson ff70cc84f8 Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 6 years ago
  Nick Mathewson 8c8ed91aae Merge remote-tracking branch 'rl1987/bug24891' 6 years ago
  George Kadianakis 99974d4c1e Silence warning of relaycell/circbw tst. 6 years ago
  Nick Mathewson 1b04dab60c copy 0.3.3.7 changelog forward to master 6 years ago
  Nick Mathewson 147c67d81d Merge branch 'maint-0.3.3' 6 years ago
  Nick Mathewson bbbb5f39be bump to 0.3.3.7-dev 6 years ago
  Nick Mathewson ccf2d65610 bump to 0.3.4.2-alpha-dev 6 years ago
  Nick Mathewson bc951e83aa Fold in changelog entry. 6 years ago
  Nick Mathewson 16381b579e Merge branch 'maint-0.2.9' into maint-0.3.1 6 years ago
  Nick Mathewson 53513e4bfe Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson eaa359650c Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago
  Nick Mathewson 03f3ee6d74 Merge branch 'maint-0.3.3' 6 years ago
  Nick Mathewson ef671147f2 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 6 years ago
  Linus Nordberg 2ef448da2f Add a changelog entry. 6 years ago
  Linus Nordberg 6cf9288518 Add IPv6 orport address for dannenberg. 6 years ago
  Nick Mathewson b13fe14cb0 Merge branch 'maint-0.3.3' 6 years ago
  Nick Mathewson f2e7570c75 Bump to 0.3.3.7 6 years ago
  Nick Mathewson 73aae608d5 Remove folded-in changes files 6 years ago
  Nick Mathewson 4540ddd3e3 Lightly edit changelog 6 years ago
  Nick Mathewson e9ecb09786 format changelog. 6 years ago
  Nick Mathewson 33919d8e1d add more entries to changelog 6 years ago
  Nick Mathewson 6230dfaf14 Merge branch 'maint-0.3.3' 6 years ago
  Nick Mathewson 5d8a927aa3 Merge branch 'maint-0.3.1' into maint-0.3.2 6 years ago
  Nick Mathewson 7fff99110b Merge branch 'maint-0.3.2' into maint-0.3.3 6 years ago