summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Move the IP address note in SOCKSport.bug_11061Linus Nordberg2015-03-12
* Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-10
|\
| * Fix check-spacesNick Mathewson2015-03-10
* | Remove one changes files from master (0.2.7) that already got merged into cha...Nick Mathewson2015-03-10
* | Remove the changes files from master (0.2.7) that already got merged into cha...Nick Mathewson2015-03-10
* | forward-port the 0.2.6.4-0rc changelogNick Mathewson2015-03-10
* | Whoops; I somehow dropped 9321 from the changelogNick Mathewson2015-03-10
* | Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-10
|\ \ | |/
| * bump 0.2.6 to 0.2.6.4-rc-devNick Mathewson2015-03-10
* | Merge commit 'origin/maint-0.2.6^'Nick Mathewson2015-03-10
|\ \ | |/
| * Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6Nick Mathewson2015-03-09
| |\
| | * Don't use checked strl{cat,cpy} on OSX.Nick Mathewson2015-03-09
* | | Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-09
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson2015-03-09
| |\ \
| | * \ Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson2015-03-09
| | |\ \
| | | * \ Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4Nick Mathewson2015-03-09
| | | |\ \
| | | | * | Update geoip6 to the March 3 2015 database.Karsten Loesing2015-03-09
| | | * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2015-03-09
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Update geoip to the March 3 2015 database.Karsten Loesing2015-03-09
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-09
|\ \ \ \ \ \ | |/ / / / /
| * | | | | We actually merged this one a while ago.Nick Mathewson2015-03-09
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-09
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson2015-03-09
| |\ \ \ \ \ | | |/ / / /
| | * | | | Restore c89 in 0.2.5Nick Mathewson2015-03-09
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson2015-03-09
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5Nick Mathewson2015-03-09
| | |\ \ \ \
| | * | | | | GETINFO bw-event-cache to get information on recent BW eventsNick Mathewson2015-03-09
| | * | | | | Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5Nick Mathewson2015-03-09
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5Nick Mathewson2015-03-09
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-09
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6Nick Mathewson2015-03-09
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make boostrap events include hostname ANDaddr AND digestNick Mathewson2015-03-04
| | * | | | | | | | Include a HOST item in BOOTSTRAP problem messagesNick Mathewson2015-02-27
* | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-09
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Changes file for 15188Nick Mathewson2015-03-09
| * | | | | | | | | testing_common.c: avoid side-effects of tor_assertTom van der Woerdt2015-03-09
* | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-09
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson2015-03-09
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson2015-03-09
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2015-03-09
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | | * | | | | | Adjust changes headerNick Mathewson2015-03-09
| | | | * | | | | | Make the assert related to 15083 a tiny bit more tolerantNick Mathewson2015-03-03
| | | | * | | | | | Do not leave empty, invalid chunks in buffers during buf_pullupNick Mathewson2015-03-03
* | | | | | | | | | Be exact about the number of spaces in the header.cypherpunks2015-03-09
* | | | | | | | | | Add `check-changes` rule for checking formatting of changes files.cypherpunks2015-03-09
* | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-04
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Revert "Missing dependencies; fixes 15127."Nick Mathewson2015-03-04
* | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-04
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'public/bug15064_025' into maint-0.2.6Nick Mathewson2015-03-04
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Make TransProxyType ipfw work correctlyNick Mathewson2015-03-04
| | |/ / / / / / /
generated by cgit v1.2.1 (git 2.18.0) at 2024-02-02 09:20:44 +0000