Commits · 9abef516f609a619b25e8f53a413a2e3df05bde8 · Benjamin J. Thompson / Tor · GitLab

Dec 13, 2017
- Merge branch 'maint-0.3.2' · 9abef516
  Nick Mathewson authored Dec 12, 2017
  
  9abef516
- Merge branch 'bug24367_032_squashed' into maint-0.3.2 · bf89b089
  Nick Mathewson authored Dec 12, 2017
  
  bf89b089
- Make sure bridges are definitely running before delaying directory fetches · 19a4abf2
  teor authored Dec 11, 2017 and Nick Mathewson committed Dec 12, 2017
  19a4abf2
- Simplify some conditionals in circuit_get_open_circ_or_launch() · 6b5c7067
  teor authored Dec 11, 2017 and Nick Mathewson committed Dec 12, 2017
  6b5c7067
Dec 12, 2017
- Merge branch 'maint-0.3.2' · 13455c0f
  Nick Mathewson authored Dec 12, 2017
  
  13455c0f
- Merge remote-tracking branch 'dgoulet/bug24595_032_02' into maint-0.3.2 · cf5ab593
  Nick Mathewson authored Dec 12, 2017
  
  cf5ab593
- Merge remote-tracking branch 'teor/bug23827-v2' · e622f208
  Nick Mathewson authored Dec 12, 2017
  
  e622f208
- hs-v3: Don't lookup an intro point while cleaning it up · b6fd78ea
  George Kadianakis authored Dec 12, 2017 and David Goulet committed Dec 12, 2017
  b6fd78ea
- Fix compilation: logfile_is_external() must accept const* · 9c604e2b
  Nick Mathewson authored Dec 12, 2017
  
  9c604e2b
- Merge remote-tracking branch 'ahf-oniongit/bugs/24362' · 6c5a73f8
  Nick Mathewson authored Dec 12, 2017
  
  6c5a73f8
- Merge remote-tracking branch 'teor/log24558' · 21ee765d
  Nick Mathewson authored Dec 12, 2017
  
  21ee765d
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 4c54021b
  Nick Mathewson authored Dec 12, 2017
  
  4c54021b
- Merge branch 'maint-0.3.2' · 644ec835
  Nick Mathewson authored Dec 12, 2017
  
  644ec835
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 31ce03a2
  Nick Mathewson authored Dec 12, 2017
  
  31ce03a2
- rename changes file · d3b7a2bd
  Nick Mathewson authored Dec 12, 2017
  
  d3b7a2bd
- Merge remote-tracking branch 'teor/doc24596' · 632d6cbc
  Nick Mathewson authored Dec 12, 2017
  
  632d6cbc
- Make configure log messages less confusing during static builds · 2ff706ba
  teor authored Dec 12, 2017
  2ff706ba
- Fix a typo in CodingStandards.md · 7b591996
  teor authored Dec 12, 2017
  7b591996
- Simplify explicit conditional checks into an inlined function. · cbc465a3
  Alexander Hansen Færøy authored Dec 12, 2017
  cbc465a3
Dec 11, 2017
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 4593f5a6
  Nick Mathewson authored Dec 11, 2017
  
  4593f5a6
- Merge branch 'maint-0.3.0' into maint-0.3.1 · cdee62da
  Nick Mathewson authored Dec 11, 2017
  
  cdee62da
- Merge branch 'maint-0.2.9' into maint-0.3.0 · da38904e
  Nick Mathewson authored Dec 11, 2017
  
  da38904e
- Merge branch 'maint-0.3.2' · a6587e90
  Nick Mathewson authored Dec 11, 2017
  
  a6587e90
- Merge branch 'maint-0.2.8' into maint-0.2.9 · eecfed0c
  Nick Mathewson authored Dec 11, 2017
  
  eecfed0c
- Merge branch 'maint-0.2.5' into maint-0.2.8 · f7151387
  Nick Mathewson authored Dec 11, 2017
  
  f7151387
- Merge branch 'bug24167_025' into maint-0.2.5 · 1deda210
  Nick Mathewson authored Dec 11, 2017
  
  1deda210
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 43fb8fc5
  Nick Mathewson authored Dec 11, 2017
  
  43fb8fc5
- Merge branch 'maint-0.3.2' · 422ff8f9
  Nick Mathewson authored Dec 11, 2017
  
  422ff8f9
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 04524443
  Nick Mathewson authored Dec 11, 2017
  
  04524443
- Merge branch 'maint-0.2.9' into maint-0.3.0 · 2ea573ec
  Nick Mathewson authored Dec 11, 2017
  
  2ea573ec
- Merge branch 'maint-0.2.8' into maint-0.2.9 · eaaa1108
  Nick Mathewson authored Dec 11, 2017
  
  eaaa1108
- Merge branch 'maint-0.2.5' into maint-0.2.8 · bc1ea4f4
  Nick Mathewson authored Dec 11, 2017
  
  bc1ea4f4
- Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 · f5d4bdf3
  Nick Mathewson authored Dec 11, 2017
  
  f5d4bdf3
- Merge branch 'maint-0.3.1' into maint-0.3.2 · e553bf3c
  Nick Mathewson authored Dec 11, 2017
  
  e553bf3c
- Merge branch 'maint-0.3.2' · 16ec4da6
  Nick Mathewson authored Dec 11, 2017
  
  16ec4da6
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 736e7299
  Nick Mathewson authored Dec 11, 2017
  
  736e7299
- Merge branch 'maint-0.2.9' into maint-0.3.0 · 7fcb222a
  Nick Mathewson authored Dec 11, 2017
  
  7fcb222a
- Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9 · 7e486dd6
  Nick Mathewson authored Dec 11, 2017
  
  7e486dd6
- Merge branch 'maint-0.3.1' into maint-0.3.2 · bfc9be4c
  Nick Mathewson authored Dec 11, 2017
  
  bfc9be4c
- Merge branch 'maint-0.3.2' · abcc7032
  Nick Mathewson authored Dec 11, 2017
  
  abcc7032