Commits · 7cc3cdef2218d5689f2e51ca475b1c21db1359e5 · Hiro / Tor

Jun 13, 2018
- Merge branch 'maint-0.3.3' · 7cc3cdef
  Nick Mathewson authored 6 years ago
  
  7cc3cdef
- Merge branch 'maint-0.3.2' into maint-0.3.3 · ca6d289c
  Nick Mathewson authored 6 years ago
  
  ca6d289c
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 7e7585d0
  Nick Mathewson authored 6 years ago
  
  7e7585d0
- Fix an extra space in a changes file · 9713ecfc
  Nick Mathewson authored 6 years ago
  
  9713ecfc
- Merge branch 'maint-0.3.3' · 286d0299
  Nick Mathewson authored 6 years ago
  
  286d0299
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 049ba667
  Nick Mathewson authored 6 years ago
  
  049ba667
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 6017447e
  Nick Mathewson authored 6 years ago
  
  6017447e
- Merge branch 'bug26158_031' into maint-0.3.1 · 94f30076
  Nick Mathewson authored 6 years ago
  
  94f30076
- Merge branch 'maint-0.3.3' · 76e9de7c
  Nick Mathewson authored 6 years ago
  
  76e9de7c
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 1c80eb92
  Nick Mathewson authored 6 years ago
  
  1c80eb92
- Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 · ff70cc84
  Nick Mathewson authored 6 years ago
  
  ff70cc84
- Merge remote-tracking branch 'rl1987/bug24891' · 8c8ed91a
  Nick Mathewson authored 6 years ago
  
  8c8ed91a
Jun 12, 2018
- copy 0.3.3.7 changelog forward to master · 1b04dab6
  Nick Mathewson authored 6 years ago
  
  1b04dab6
- Merge branch 'maint-0.3.3' · 147c67d8
  Nick Mathewson authored 6 years ago
  
  "ours" to avoid version bump.
  147c67d8
- bump to 0.3.3.7-dev · bbbb5f39
  Nick Mathewson authored 6 years ago
  
  bbbb5f39
- bump to 0.3.4.2-alpha-dev · ccf2d656
  Nick Mathewson authored 6 years ago
  
  ccf2d656
- Fold in changelog entry. · bc951e83
  Nick Mathewson authored 6 years ago
  
  bc951e83
- Merge branch 'maint-0.2.9' into maint-0.3.1 · 16381b57
  Nick Mathewson authored 6 years ago
  
  16381b57
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 53513e4b
  Nick Mathewson authored 6 years ago
  
  53513e4b
- Merge branch 'maint-0.3.2' into maint-0.3.3 · eaa35965
  Nick Mathewson authored 6 years ago
  
  eaa35965
- Merge branch 'maint-0.3.3' · 03f3ee6d
  Nick Mathewson authored 6 years ago
  
  03f3ee6d
- Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 · ef671147
  Nick Mathewson authored 6 years ago
  
  ef671147
- Add a changelog entry. · 2ef448da
  Linus Nordberg authored 6 years ago and Nick Mathewson committed 6 years ago
  
  2ef448da
- Add IPv6 orport address for dannenberg. · 6cf92885
  Linus Nordberg authored 6 years ago and Nick Mathewson committed 6 years ago
  
  6cf92885
- Merge branch 'maint-0.3.3' · b13fe14c
  Nick Mathewson authored 6 years ago
  
  "ours" merge to avoid version bump.
  b13fe14c
- Bump to 0.3.3.7 · f2e7570c
  Nick Mathewson authored 6 years ago
  
  f2e7570c
- Remove folded-in changes files · 73aae608
  Nick Mathewson authored 6 years ago
  
  73aae608
- Lightly edit changelog · 4540ddd3
  Nick Mathewson authored 6 years ago
  
  Remove the "documentation" section, since a comment-only change doesn't usually get a changelog entry.
  4540ddd3
- format changelog. · e9ecb097
  Nick Mathewson authored 6 years ago
  
  e9ecb097
- add more entries to changelog · 33919d8e
  Nick Mathewson authored 6 years ago
  
  33919d8e
- Merge branch 'maint-0.3.3' · 6230dfaf
  Nick Mathewson authored 6 years ago
  
  6230dfaf
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 5d8a927a
  Nick Mathewson authored 6 years ago
  
  5d8a927a
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 7fff9911
  Nick Mathewson authored 6 years ago
  
  7fff9911
- Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1 · d84581a3
  Nick Mathewson authored 6 years ago
  
  d84581a3
- Merge remote-tracking branch 'rl1987/bug26283' · f4e51990
  Nick Mathewson authored 6 years ago
  
  f4e51990
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 74ac463e
  Nick Mathewson authored 6 years ago
  
  74ac463e
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 6dca180a
  Nick Mathewson authored 6 years ago
  
  6dca180a
- Merge branch 'maint-0.3.3' · b2470f51
  Nick Mathewson authored 6 years ago
  
  b2470f51
- Merge branch 'maint-0.2.9' into maint-0.3.1 · 19f38685
  Nick Mathewson authored 6 years ago
  
  19f38685
Jun 11, 2018
- bump to 0.3.4.2-alpha · fa195626
  Nick Mathewson authored 6 years ago
  
  fa195626