 Nick Mathewson
|
59f4c41087
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
7c9be64e1a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
|
9 gadi atpakaļ |
|
Nick Mathewson
|
306f2f0eff
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
|
9 gadi atpakaļ |
|
Nick Mathewson
|
220e9be095
Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
|
9 gadi atpakaļ |
|
Nick Mathewson
|
5588e677bd
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
|
9 gadi atpakaļ |
 Karsten Loesing
|
62714068d9
Update geoip6 to the March 3 2015 database.
|
9 gadi atpakaļ |
|
Karsten Loesing
|
beda8d2934
Update geoip to the March 3 2015 database.
|
9 gadi atpakaļ |
|
Nick Mathewson
|
e3b6373003
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
c066f2d30b
We actually merged this one a while ago.
|
9 gadi atpakaļ |
|
Nick Mathewson
|
4af742fe97
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
5c08a19eda
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
|
9 gadi atpakaļ |
|
Nick Mathewson
|
64bfc2930a
Restore c89 in 0.2.5
|
9 gadi atpakaļ |
|
Nick Mathewson
|
8450f6e9a0
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
|
9 gadi atpakaļ |
|
Nick Mathewson
|
448bd22092
Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5
|
9 gadi atpakaļ |
|
Nick Mathewson
|
62631904cb
GETINFO bw-event-cache to get information on recent BW events
|
10 gadi atpakaļ |
|
Nick Mathewson
|
e3408248b9
Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5
|
9 gadi atpakaļ |
|
Nick Mathewson
|
410ce4cb49
Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5
|
9 gadi atpakaļ |
|
Nick Mathewson
|
ed7f2482e2
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
fb0de57ba2
Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6
|
9 gadi atpakaļ |
|
Nick Mathewson
|
0ec135b696
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
42d877f084
Changes file for 15188
|
9 gadi atpakaļ |
 Tom van der Woerdt
|
d39ede7f20
testing_common.c: avoid side-effects of tor_assert
|
9 gadi atpakaļ |
|
Nick Mathewson
|
bd80ba9a9f
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
a7f75b2056
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
|
9 gadi atpakaļ |
|
Nick Mathewson
|
1a7419c3df
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
|
9 gadi atpakaļ |
|
Nick Mathewson
|
6704e18dd2
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
|
9 gadi atpakaļ |
|
Nick Mathewson
|
addffcc14d
Adjust changes header
|
9 gadi atpakaļ |
 cypherpunks
|
034f51dd02
Be exact about the number of spaces in the header.
|
9 gadi atpakaļ |
|
cypherpunks
|
9dc90a5b7b
Add `check-changes` rule for checking formatting of changes files.
|
9 gadi atpakaļ |
|
Nick Mathewson
|
4ced3b59aa
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
