|  Nick Mathewson | 502d2c0062
							
							Merge branch 'maint-0.2.9' into maint-0.3.1 | 7 years ago | 
				
					
						|  Nick Mathewson | 6acbd4c112
							
							Merge branch 'maint-0.3.2' into maint-0.3.3 | 7 years ago | 
				
					
						|  Karsten Loesing | 033e4723f3
							
							Update geoip and geoip6 to the May 1 2018 database. | 7 years ago | 
				
					
						|  Nick Mathewson | 5eb2d58880
							
							Add a missing return after marking a stream for bad connected cell | 7 years ago | 
				
					
						|  Nick Mathewson | 7ee67c47fa
							
							Merge branch 'maint-0.3.1' into maint-0.3.2 | 7 years ago | 
				
					
						|  Nick Mathewson | b343ba9060
							
							Merge branch 'maint-0.3.2' into maint-0.3.3 | 7 years ago | 
				
					
						|  Nick Mathewson | 2d61a83513
							
							Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1 | 7 years ago | 
				
					
						|  Nick Mathewson | 15b8c860d3
							
							Merge branch 'maint-0.3.1' into maint-0.3.2 | 7 years ago | 
				
					
						|  Nick Mathewson | f64fa6b19e
							
							Merge branch 'maint-0.3.2' into maint-0.3.3 | 7 years ago | 
				
					
						|  Nick Mathewson | ba70439210
							
							Merge branch 'maint-0.2.9' into maint-0.3.1 | 7 years ago | 
				
					
						|  Nick Mathewson | edb6acf9ce
							
							Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 | 7 years ago | 
				
					
						|  David Goulet | 6e99286d45
							
							hs-v3: Add an extra white-space when parsing descriptor | 7 years ago | 
				
					
						|  Nick Mathewson | 59812789f7
							
							Merge branch 'maint-0.3.2' into maint-0.3.3 | 7 years ago | 
				
					
						|  Nick Mathewson | e5acbbd16d
							
							Merge branch 'maint-0.3.1' into maint-0.3.2 | 7 years ago | 
				
					
						|  Nick Mathewson | aa08c19703
							
							Merge branch 'maint-0.2.9' into maint-0.3.1 | 7 years ago | 
				
					
						|  David Goulet | bca8a104b2
							
							Having a ControlPort open doesn't mean we are a client | 7 years ago | 
				
					
						|  juga0 | dbdde76f56
							
							Test read bandwidth measurements with empty file | 7 years ago | 
				
					
						|  Nick Mathewson | abde29824c
							
							Merge branch 'maint-0.3.2' into maint-0.3.3 | 7 years ago | 
				
					
						|  Nick Mathewson | 394f102ea6
							
							Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2 | 7 years ago | 
				
					
						|  teor | 867fe40f91
							
							Stop logging stack contents when reading a zero-length bandwidth file | 7 years ago | 
				
					
						|  Nick Mathewson | a639a67844
							
							Merge branch 'libressl_201805_033' into maint-0.3.3 | 7 years ago | 
				
					
						|  George Kadianakis | 7e8c5e3662
							
							Detect when v3 services get disabled after HUP. | 7 years ago | 
				
					
						|  George Kadianakis | 5dc00c0661
							
							Detect when v2 services get disabled after HUP. | 7 years ago | 
				
					
						|  Roger Dingledine | b979415e8b
							
							manpage fix to stop saying CacheIPv4DNS is on by default | 7 years ago | 
				
					
						|  Nick Mathewson | 46002aa691
							
							Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3 | 7 years ago | 
				
					
						|  Nick Mathewson | 6361a250f0
							
							Merge branch 'maint-0.2.9' into maint-0.3.1 | 7 years ago | 
				
					
						|  Nick Mathewson | be5b4415c2
							
							Merge branch 'maint-0.3.1' into maint-0.3.2 | 7 years ago | 
				
					
						|  Nick Mathewson | 4c6a407b9d
							
							Merge branch 'maint-0.3.2' into maint-0.3.3 | 7 years ago | 
				
					
						|  Nick Mathewson | 44626b37f6
							
							Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3 | 7 years ago | 
				
					
						|  Nick Mathewson | 726f238b72
							
							Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1 | 7 years ago |