summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Don't init hs intro key as side effect of an assertbug15211Sebastian Hahn2015-03-12
* Don't init control authchallenge nonce as assert side effectSebastian Hahn2015-03-12
* don't init threads as side effect of assertionSebastian Hahn2015-03-12
* Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-12
|\
| * Merge branch 'bug15245_026' into maint-0.2.6Nick Mathewson2015-03-12
| |\
| | * add an explanatory commentNick Mathewson2015-03-12
| | * Also, add an assertion to assign_onionskin_to_cpuworkerNick Mathewson2015-03-12
| | * Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.Nick Mathewson2015-03-12
| |/
* | Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-12
|\ \ | |/
| * Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson2015-03-12
| |\
| | * Bump 025 version to 0.2.5.11Nick Mathewson2015-03-12
| | * Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson2015-03-12
| | |\
| | | * Bump 0.2.4 version.Nick Mathewson2015-03-12
* | | | Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson2015-03-12
|\ \ \ \ | |/ / /
| * | | Merge branch 'bug9495_redux_v2' into maint-0.2.6Nick Mathewson2015-03-12
| |\ \ \
| | * | | Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crashNick Mathewson2015-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