sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
21,136 Commits 31 Branches 486 Tags 66 MiB
Commit Graph

21136 Commits

Author SHA1 Message Date
Nick Mathewson e83affb56f Merge branch 'maint-0.2.7' into release-0.2.7 2017-02-15 07:53:11 -05:00
Nick Mathewson e6376a8004 Merge branch 'maint-0.2.6' into maint-0.2.7 2017-02-15 07:52:41 -05:00
Nick Mathewson f7ed4a7d8f Merge branch 'maint-0.2.5' into maint-0.2.6 2017-02-15 07:52:33 -05:00
Nick Mathewson 67877f55ad Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7 2017-02-15 07:51:48 -05:00
Nick Mathewson 6e7ff9ee31 Merge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6 2017-02-15 07:51:41 -05:00
Nick Mathewson aeb299ba6d Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5 2017-02-15 07:51:33 -05:00
Nick Mathewson 1889405aff Merge branch 'maint-0.2.7' into release-0.2.7 2017-02-15 07:50:55 -05:00
Nick Mathewson ed806843dc Merge branch 'maint-0.2.6' into maint-0.2.7 2017-02-15 07:47:21 -05:00
Nick Mathewson 3781f24b80 Merge branch 'maint-0.2.5' into maint-0.2.6 2017-02-15 07:47:12 -05:00
Nick Mathewson a452b71395 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-15 07:47:04 -05:00
Nick Mathewson 194e31057f Avoid integer underflow in tor_version_compare. 
Fix for TROVE-2017-001 and bug 21278.

(Note: Instead of handling signed ints "correctly", we keep the old
behavior, except for the part where we would crash with -ftrapv.)
 2017-02-14 16:10:27 -05:00
Roger Dingledine 5c4235888a Merge branch 'maint-0.2.6' into maint-0.2.7 2017-02-13 15:28:50 -05:00
Roger Dingledine e778a411b9 Merge branch 'maint-0.2.5' into maint-0.2.6 2017-02-13 15:27:57 -05:00
Roger Dingledine 144ec3d58c Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-13 15:23:50 -05:00
Roger Dingledine 635c5a8a92 be sure to remember the changes file for #20384 2017-02-13 15:22:36 -05:00
Nick Mathewson 2eb5eca088 Merge branch 'maint-0.2.7' into release-0.2.7 2017-02-13 14:39:19 -05:00
Nick Mathewson 75fe218b16 Merge branch 'maint-0.2.6' into maint-0.2.7 2017-02-13 14:37:49 -05:00
Nick Mathewson 43c18b1b7a Merge branch 'maint-0.2.5' into maint-0.2.6 2017-02-13 14:37:42 -05:00
Nick Mathewson 124062e843 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-13 14:37:01 -05:00
Karsten Loesing f6016058b4 Update geoip and geoip6 to the February 8 2017 database. 2017-02-12 15:56:31 +01:00
Nick Mathewson 26ea56a6c2 Merge branch 'maint-0.2.7' into release-0.2.7 2017-02-07 10:39:54 -05:00
Nick Mathewson 4bce2072ac Merge branch 'maint-0.2.6' into maint-0.2.7 2017-02-07 10:39:03 -05:00
Nick Mathewson f2a30413a3 Merge branch 'maint-0.2.5' into maint-0.2.6 2017-02-07 10:37:53 -05:00
Nick Mathewson 2ce4330249 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 2017-02-07 10:37:43 -05:00
Nick Mathewson c056d19323 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-07 10:37:31 -05:00
Nick Mathewson 85a2487f97 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix 2017-02-07 09:49:23 -05:00
Nick Mathewson cfeb1db2fb Add comments to connection_check_event(). 2017-02-07 09:48:24 -05:00
Nick Mathewson 457d38a6e9 Change behavior on missing/present event to warn instead of asserting. 
Add a changes file.
 2017-02-07 09:48:19 -05:00
Nick Mathewson 650c03127a If we start/stop reading on a dnsserv connection, don't assert. 
Fixes bug 16248. Patch from cypherpunks.  Bugfix on 0.2.0.1-alpha.
 2017-02-07 09:48:13 -05:00
Nick Mathewson 6cfbaed3a5 Merge branch 'maint-0.2.7' into release-0.2.7 2017-02-07 09:30:33 -05:00
Nick Mathewson 86d5a6fac0 Merge branch 'maint-0.2.6' into maint-0.2.7 
"ours" merge to avoid reverting 17354, which was already fixed in
0.2.7.4-rc.
 2017-02-07 09:29:27 -05:00
Nick Mathewson 5446cb8d3d Revert "Add hidserv-stats filname to our sandbox filter" 
Reverting this in 0.2.6 only -- we're no backporting
seccomp2-loosening fixes to 0.2.6.

This reverts commit 2ec5e24c58.
 2017-02-07 09:28:50 -05:00
Nick Mathewson 632d006897 Merge branch 'maint-0.2.7' into release-0.2.7 2017-02-07 09:21:17 -05:00
Nick Mathewson 0a43134009 Merge branch 'maint-0.2.6' into maint-0.2.7 
This is an "ours" merge to avoid conflicts on the authority list:
the 0.2.7 branch already has the tonga->bifroest merge.
 2017-02-07 09:20:13 -05:00
Nick Mathewson c6f2ae514e Merge branch 'maint-0.2.5' into maint-0.2.6 2017-02-07 09:18:54 -05:00
Nick Mathewson b9ef21cf56 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-07 09:17:59 -05:00
Nick Mathewson e4a42242ea Backport the tonga->bifroest move to 0.2.4. 
This is a backport of 19728 and 19690
 2017-02-07 09:15:21 -05:00
Nick Mathewson 618fafd5c8 Merge branch 'maint-0.2.7' into release-0.2.7 2017-02-07 08:56:44 -05:00
Nick Mathewson 115cefdeee Merge branch 'maint-0.2.6' into maint-0.2.7 2017-02-07 08:55:07 -05:00
Nick Mathewson e6965f78b8 Merge branch 'maint-0.2.5' into maint-0.2.6 2017-02-07 08:54:54 -05:00
Nick Mathewson 6b37512dc7 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-07 08:54:47 -05:00
Nick Mathewson d6eae78e29 Merge remote-tracking branch 'public/bug19152_024_v2' into maint-0.2.4 2017-02-07 08:47:11 -05:00
Nick Mathewson 0f9054cd86 Merge branch 'maint-0.2.7' into release-0.2.7 2017-02-07 08:41:39 -05:00
Nick Mathewson eb72365554 Merge branch 'maint-0.2.6' into maint-0.2.7 2017-02-07 08:39:25 -05:00
Nick Mathewson 8936c50d83 Merge branch 'maint-0.2.5' into maint-0.2.6 2017-02-07 08:39:07 -05:00
Nick Mathewson 05ec055c41 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-07 08:38:59 -05:00
Nick Mathewson 51675f97d3 Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4 2017-02-07 08:37:07 -05:00
Nick Mathewson da0d5ad983 Merge branch 'maint-0.2.5' into maint-0.2.6 2017-02-07 08:34:37 -05:00
Nick Mathewson 332543baed Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-07 08:34:08 -05:00
Nick Mathewson 6cb8c0fd4e Refine the memwipe() arguments check for 18089 a little more. 
We still silently ignore
     memwipe(NULL, ch, 0);
and
     memwipe(ptr, ch, 0);  /* for ptr != NULL */

But we now assert on:
     memwipe(NULL, ch, 30);
 2017-02-07 08:33:51 -05:00