 Nick Mathewson
|
6e7ff9ee31
Merge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6
|
vor 7 Jahren |
|
Nick Mathewson
|
3781f24b80
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 7 Jahren |
|
Nick Mathewson
|
a452b71395
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 7 Jahren |
|
Nick Mathewson
|
194e31057f
Avoid integer underflow in tor_version_compare.
|
vor 7 Jahren |
 Roger Dingledine
|
e778a411b9
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 7 Jahren |
|
Roger Dingledine
|
144ec3d58c
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 7 Jahren |
|
Roger Dingledine
|
635c5a8a92
be sure to remember the changes file for #20384
|
vor 7 Jahren |
|
Nick Mathewson
|
43c18b1b7a
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 7 Jahren |
|
Nick Mathewson
|
124062e843
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 7 Jahren |
 Karsten Loesing
|
f6016058b4
Update geoip and geoip6 to the February 8 2017 database.
|
vor 7 Jahren |
|
Nick Mathewson
|
f2a30413a3
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 7 Jahren |
|
Nick Mathewson
|
2ce4330249
Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5
|
vor 7 Jahren |
|
Nick Mathewson
|
c056d19323
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 7 Jahren |
|
Nick Mathewson
|
85a2487f97
Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix
|
vor 7 Jahren |
|
Nick Mathewson
|
cfeb1db2fb
Add comments to connection_check_event().
|
vor 8 Jahren |
|
Nick Mathewson
|
457d38a6e9
Change behavior on missing/present event to warn instead of asserting.
|
vor 8 Jahren |
|
Nick Mathewson
|
650c03127a
If we start/stop reading on a dnsserv connection, don't assert.
|
vor 8 Jahren |
|
Nick Mathewson
|
5446cb8d3d
Revert "Add hidserv-stats filname to our sandbox filter"
|
vor 7 Jahren |
|
Nick Mathewson
|
c6f2ae514e
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 7 Jahren |
|
Nick Mathewson
|
b9ef21cf56
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 7 Jahren |
|
Nick Mathewson
|
e4a42242ea
Backport the tonga->bifroest move to 0.2.4.
|
vor 7 Jahren |
|
Nick Mathewson
|
e6965f78b8
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 7 Jahren |
|
Nick Mathewson
|
6b37512dc7
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 7 Jahren |
|
Nick Mathewson
|
d6eae78e29
Merge remote-tracking branch 'public/bug19152_024_v2' into maint-0.2.4
|
vor 7 Jahren |
|
Nick Mathewson
|
8936c50d83
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 7 Jahren |
|
Nick Mathewson
|
05ec055c41
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 7 Jahren |
|
Nick Mathewson
|
51675f97d3
Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4
|
vor 7 Jahren |
|
Nick Mathewson
|
da0d5ad983
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 7 Jahren |
|
Nick Mathewson
|
332543baed
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 7 Jahren |
|
Nick Mathewson
|
6cb8c0fd4e
Refine the memwipe() arguments check for 18089 a little more.
|
vor 8 Jahren |
