Commits · 8cc57bccfe9acd3d64ef30349c3727586e253bb3 · The Tor Project / Core / Tor

Oct 24, 2017
- Isis has been noticing typos. · 8cc57bcc
  Nick Mathewson authored 7 years ago
  
  8cc57bcc
- Repair "make check" · f709dce4
  Nick Mathewson authored 7 years ago
  
  f709dce4
- Merge remote-tracking branch 'arma/ticket23637' · 64900066
  Nick Mathewson authored 7 years ago
  
  64900066
- Merge branch 'maint-0.3.2' · 350fecfa
  Nick Mathewson authored 7 years ago
  
  350fecfa
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 122a7f88
  Nick Mathewson authored 7 years ago
  
  122a7f88
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 990322fc
  Nick Mathewson authored 7 years ago
  
  "ours" merge to avoid version bump
  990322fc
- Merge branch 'maint-0.2.9' into maint-0.3.0 · 7bebd1b0
  Nick Mathewson authored 7 years ago
  
  "ours" merge to avoid version bump
  7bebd1b0
- bump version in the other places :/ · 5325e7cc
  Nick Mathewson authored 7 years ago
  
  5325e7cc
- bump version in the other places :/ · 552b6202
  Nick Mathewson authored 7 years ago
  
  552b6202
- Merge branch 'maint-0.3.2' · 51de3a1c
  Nick Mathewson authored 7 years ago
  
  51de3a1c
- Merge branch 'maint-0.3.1' into maint-0.3.2 · cce1a6ef
  Nick Mathewson authored 7 years ago
  
  "ours" merge to avoid version bump
  cce1a6ef
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 38a58076
  Nick Mathewson authored 7 years ago
  
  "ours" merge to avoid version bump
  38a58076
- Merge branch 'maint-0.2.9' into maint-0.3.0 · 302b5f57
  Nick Mathewson authored 7 years ago
  
  "ours" merge to avoid version bump
  302b5f57
- Merge branch 'maint-0.2.8' into maint-0.2.9 · 725f2371
  Nick Mathewson authored 7 years ago
  
  "ours" merge to avoid version bump
  725f2371
- Merge branch 'maint-0.2.5' into maint-0.2.8 · 912ebf16
  Nick Mathewson authored 7 years ago
  
  "ours" merge to avoid version bump
  912ebf16
- bump to 0.3.1.8 · cbb41ddf
  Nick Mathewson authored 7 years ago
  
  cbb41ddf
- bump to 0.3.0.12 · d913a731
  Nick Mathewson authored 7 years ago
  
  d913a731
- bump to 0.2.9.13 · 09d2ae56
  Nick Mathewson authored 7 years ago
  
  09d2ae56
- bump to 0.2.8.16 · d4befa03
  Nick Mathewson authored 7 years ago
  
  d4befa03
- bump to 0.2.5.15 · 743eee49
  Nick Mathewson authored 7 years ago
  
  743eee49
- Merge branch 'maint-0.3.2' · abbd6a36
  Nick Mathewson authored 7 years ago
  
  abbd6a36
- Merge branch 'bug23952_032' into maint-0.3.2 · 0d4addfc
  Nick Mathewson authored 7 years ago
  
  0d4addfc
Oct 23, 2017
- Merge branch 'maint-0.3.0' into maint-0.3.1 · f0a6ea0b
  Nick Mathewson authored 7 years ago
  
  f0a6ea0b
- Merge branch 'maint-0.3.2' · f7707c90
  Nick Mathewson authored 7 years ago
  
  f7707c90
- Merge branch 'maint-0.3.1' into maint-0.3.2 · b1d6cf25
  Nick Mathewson authored 7 years ago
  
  b1d6cf25
- Merge branch 'maint-0.2.9' into maint-0.3.0 · 9ae4ffc0
  Nick Mathewson authored 7 years ago
  
  9ae4ffc0
- Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9 · b1bd1bf1
  Nick Mathewson authored 7 years ago
  
  b1bd1bf1
- Have LOG_PROTOCOL_WARN call its own function · 48ee85e0
  Nick Mathewson authored 7 years ago
  
  Also, make the function that implements LOG_PROTOCOL_WARN use a cached value of the desired loglevel, rather than calling get_options().
  48ee85e0
- Merge branch 'maint-0.3.2' · 880d596f
  Nick Mathewson authored 7 years ago
  
  880d596f
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 8b8d5010
  Nick Mathewson authored 7 years ago
  
  "ours" merge to avoid taking af33fdd7
  8b8d5010
- Remove the length limit from write_http_status_line · af33fdd7
  Nick Mathewson authored 7 years ago
  
  Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin failure message really long. Backport from 0.3.2's 771fb7e7, where arma said "get rid of the scary 256-byte-buf landmine".
  af33fdd7
- Merge branch 'maint-0.2.9' into maint-0.3.0 · eac4c374
  Nick Mathewson authored 7 years ago
  
  eac4c374
- Merge branch 'maint-0.2.8' into maint-0.2.9 · fcd5c314
  Nick Mathewson authored 7 years ago
  
  fcd5c314
- Merge branch 'maint-0.3.2' · 49e8352f
  Nick Mathewson authored 7 years ago
  
  49e8352f
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 6a7aa473
  Nick Mathewson authored 7 years ago
  
  6a7aa473
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 85115796
  Nick Mathewson authored 7 years ago
  
  85115796
- Adjust test, now that there are 9 dirauths again · a5f5bda4
  Nick Mathewson authored 7 years ago
  
  a5f5bda4
- Merge branch 'maint-0.2.9' into maint-0.3.0 · c93ecb81
  Nick Mathewson authored 7 years ago
  
  c93ecb81
- Merge branch 'maint-0.2.8' into maint-0.2.9 · 1db5081b
  Nick Mathewson authored 7 years ago
  
  1db5081b
- Merge branch 'maint-0.3.2' · d99c6b72
  Nick Mathewson authored 7 years ago
  
  d99c6b72