summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* fixup! Commit second draft of Jake's SOCKS5-over-AF_UNIX patch. See ticket #...ticket12585_v2Andrea Shepard2014-08-11
* Commit second draft of Jake's SOCKS5-over-AF_UNIX patch. See ticket #12585.Jacob Appelbaum2014-08-11
* Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson2014-08-08
|\
| * Build circuits more readily when DisableNetwork goes to 0Roger Dingledine2014-08-06
| * fix three typos in commentsRoger Dingledine2014-08-06
* | and oh hey, repeat code :)Roger Dingledine2014-08-03
* | fix typoRoger Dingledine2014-08-03
* | Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson2014-07-30
|\ \ | |/
| * Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' in...Nick Mathewson2014-07-30
| |\
| | * Explicitly disable RunAsDaemon in the systemd unit file (#12731).intrigeri2014-07-30
| * | Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into ...Nick Mathewson2014-07-30
| |\ \
| | * | Verify configuration file via ExecStartPre in the systemd unit file (#12730).intrigeri2014-07-30
| | |/
* | | Cast long long arguments to (int) for tt_int_op()Peter Palfrader2014-07-28
* | | and bring all the changelogs into master tooRoger Dingledine2014-07-28
* | | Merge branch 'maint-0.2.5'Roger Dingledine2014-07-28
|\ \ \ | |/ /
| * | bump to 0.2.5.6-alphaRoger Dingledine2014-07-28
| * | Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine2014-07-28
| |\ \
| | * | bump to 0.2.4.23Roger Dingledine2014-07-28
* | | | Merge branch 'maint-0.2.5'Roger Dingledine2014-07-28
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine2014-07-28
| |\ \ \ | | |/ /
| | * | Warn and drop the circuit if we receive an inbound 'relay early' cellRoger Dingledine2014-07-28
| | * | add a changes file for bug 12718Roger Dingledine2014-07-27
| | * | Confusing log message when circuit can't be extendedArlo Breault2014-07-27
* | | | Merge branch 'maint-0.2.5'Roger Dingledine2014-07-25
|\ \ \ \ | |/ / /
| * | | get rid of already-merged prop221 changes fileRoger Dingledine2014-07-25
| * | | Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine2014-07-25
| |\ \ \ | | |/ /
| | * | circuit_build_failed: distinguish "first hop chan failed", "CREATE failed"Nick Mathewson2014-07-25
| | * | Implement proposal 221: Stop sending CREATE_FASTNick Mathewson2014-07-25
* | | | Merge branch 'maint-0.2.5'Roger Dingledine2014-07-24
|\ \ \ \ | |/ / /
| * | | get rid of already-merged bug12227 changes fileRoger Dingledine2014-07-24
| * | | Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine2014-07-24
| |\ \ \ | | |/ /
| | * | Avoid illegal read off end of an array in prune_v2_cipher_listNick Mathewson2014-07-24
| * | | fix typo that crept in to 0.2.4.4-alphaRoger Dingledine2014-07-24
* | | | Merge branch 'maint-0.2.5'Roger Dingledine2014-07-24
|\ \ \ \ | |/ / /
| * | | Raise guard threshold to top 25% or 2000 kilounitsRoger Dingledine2014-07-24
* | | | Merge branch 'maint-0.2.5'Roger Dingledine2014-07-24
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine2014-07-24
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * update manpage for numentryguards / numdirectoryguardsRoger Dingledine2014-07-24
| | * add a NumDirectoryGuards consensus param tooRoger Dingledine2014-07-24
| | * Add and use a new NumEntryGuards consensus parameter.Roger Dingledine2014-07-24
* | | Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson2014-07-23
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson2014-07-23
| |\ \ | | |/
| | * Merge branch 'curve25519-donna32' into maint-0.2.4Nick Mathewson2014-07-23
| | |\
| | | * Put the bug number and correct credits in the changes file for the new curve2...Nick Mathewson2014-07-23
| | | * Small tweaks to make curve25519-donna32 compile with our warningsNick Mathewson2014-07-15
| | | * Update to latest curve25519-donna32Nick Mathewson2014-07-15
* | | | Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson2014-07-21
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson2014-07-21
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4Nick Mathewson2014-07-21
| | |\ \
| | | * | Update geoip6 to the July 10 2014 database.Karsten Loesing2014-07-18
| | | |/