Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • Tor Tor
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 335
    • Issues 335
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 30
    • Merge requests 30
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Artifacts
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

Admin message

GitLab has been upgraded GitLab 16, please report any issues!

  • The Tor Project
  • Core
  • TorTor
  • Merge requests
  • !50

#33781 for 0.3.5: Strip '\r' characters when reading text files on Unix.

  • Review changes

  • Download
  • Patches
  • Plain diff
Merged Alexander Færøy requested to merge ahf/tor:bugs/33781_035 into maint-0.3.5 Jul 14, 2020
  • Overview 4
  • Commits 2
  • Pipelines 0
  • Changes 3

This patch ensures that we strip "\r" characters on both Windows as well as Unix when we read text files. This should prevent the issue where some Tor state files have been moved from a Windows machine, and thus contains CRLF line ending, to a Unix machine where only \n is needed.

We add a test-case to ensure that we handle this properly on all our platforms.

See: https://bugs.torproject.org/tpo/core/tor/33781

This is the 0.3.5 replacement for !34 (closed).

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: bugs/33781_035